From: jepler@unpythonic.net Date: Tue, 08 Dec 2009 00:22:42 GMT Subject: [PATCH 1/2] Fix applying a line when all following lines are deletions Message-ID: <1260231763-19194-2-git-send-email-jepler@unpythonic.net> In-Reply-To: <1260231763-19194-1-git-send-email-jepler@unpythonic.net> From: Jeff Epler 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 --- lib/diff.tcl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/lib/diff.tcl b/lib/diff.tcl index bd5d189..066755b 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -664,6 +664,7 @@ proc apply_line {x y} { } set i_l $next_l } + set patch "$patch$pre_context" set patch "@@ -$hln,$n +$hln,[eval expr $n $sign 1] @@\n$patch" if {[catch { -- 1.6.3.3