1. Stefan Saasen
  2. git

Commits

jepler  committed 390425b

git-gui: Fix applying a line when all following lines are deletions

If a diff looked like:

@@
context
-del1
-del2

and you wanted to stage the deletion 'del1', the generated patch
wouldn't apply because it was missing the line 'del2' converted to
context, but this line was counted in the @@-line

Signed-off-by: Jeff Epler <jepler@unpythonic.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

  • Participants
  • Parent commits 7ec2b69
  • Branches master

Comments (0)

Files changed (1)

File lib/diff.tcl

View file
 		}
 		set i_l $next_l
 	}
+	set patch "$patch$pre_context"
 	set patch "@@ -$hln,$n +$hln,[eval expr $n $sign 1] @@\n$patch"
 
 	if {[catch {