search

git-up / GitUp

The Git interface you've been missing all your life has finally arrived.
http://gitup.co
GNU General Public License v3.0
11.48k stars 1.25k forks source link

Regression in 1.3.4: discarding file changes during rewrite deletes the whole file #885

Closed jfirebaugh closed 1 year ago

jfirebaugh commented 1 year ago

To reproduce:

  1. Select "Rewrite..." on some commit
  2. Click "Discard File Changes..."

Expected result: File is removed from diff Actual result: File is deleted entirely in diff

Works as expected in 1.3.2.

lucasderraugh commented 1 year ago

Will be addressed in 1.3.5.

We made changes in e060ece1ef5c5d72c73800df3d4c6d70d0d8ae59 that were meant to assist in bulk discard/stage operations, but there were some bugs in the handling of that.

Thanks for reporting!