summaryrefslogtreecommitdiff
path: root/git-gui/lib/diff.tcl
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2018-01-09 15:32:54 +0100
committerJunio C Hamano <gitster@pobox.com>2018-01-09 11:02:40 -0800
commit6d02c1e20471cd8b6923c82e8faacfe43a75b1e1 (patch)
tree2f3dfce7f17e875cce9a6b95b51651f794a41652 /git-gui/lib/diff.tcl
parent5ab72271e16ac23c269f5019a74a7b1d65170e47 (diff)
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 https://github.com/git-for-windows/git/issues/515 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/lib/diff.tcl')
0 files changed, 0 insertions, 0 deletions