Skip to content

Commit 6d02c1e

Browse files
dschogitster
authored andcommitted
git gui: fix staging a second line to a 1-line file
When a 1-line file is augmented by a second line, and the user tries to stage that single line via the "Stage Line" context menu item, we do not want to see "apply: corrupt patch at line 5". The reason for this error was that the hunk header looks like this: @@ -1 +1,2 @@ but the existing code expects the original range always to contain a comma. This problem is easily fixed by cutting the string "1 +1,2" (that Git GUI formerly mistook for the starting line) at the space. This fixes #515 Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5ab7227 commit 6d02c1e

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

lib/diff.tcl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,7 @@ proc apply_range_or_line {x y} {
698698
set hh [$ui_diff get $i_l "$i_l + 1 lines"]
699699
set hh [lindex [split $hh ,] 0]
700700
set hln [lindex [split $hh -] 1]
701+
set hln [lindex [split $hln " "] 0]
701702

702703
# There is a special situation to take care of. Consider this
703704
# hunk:

0 commit comments

Comments
 (0)