From fa6b5b3944b74f2ad2430f3dfec517f8f70a6663 Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Tue, 15 Jul 2008 23:11:00 +0200 Subject: [PATCH] git-gui: Fix "Stage/Unstage Line" with one line of context. To "Stage/Unstage Line" we construct a patch that contains exactly one change (either addition or removal); the hunk header was forged by counting the old side and adjusting the count by +/-1 for the new side. But when we counted the context we never counted the changed line itself. If the hunk had only one removal line and one line of context, like this: @@ -1,3 +1,2 @@ context 1 -removal context 2 We had constructed this patch: @@ -1,2 +1,1 @@ context 1 -removal context 2 which does not apply because git apply deduces that it must apply at the end of the file. ("context 2" is considered garbage and ignored.) The fix is that removal lines must be counted towards the context of the old side. Signed-off-by: Johannes Sixt Signed-off-by: Shawn O. Pearce --- lib/diff.tcl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/diff.tcl b/lib/diff.tcl index 96ba94906c..ee7f391e2f 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -423,6 +423,9 @@ proc apply_line {x y} { # the line to stage/unstage set ln [$ui_diff get $i_l $next_l] set patch "$patch$ln" + if {$c1 eq {-}} { + set n [expr $n+1] + } } elseif {$c1 ne {-} && $c1 ne {+}} { # context line set ln [$ui_diff get $i_l $next_l] -- 2.11.4.GIT