git gui: fix staging a second line to a 1-line file
cover git gui: fix staging a second line to a 1-line file
Yet another patch that is carried in Git for Windows for quite a long time. This fixes https://github.com/git-for-windows/git/issues/515.
This commit was contributed as https://github.com/patthoyts/git/gui/pull/7
which was ignored for almost three years, and then as
https://github.com/prati0100/git-gui/pull/1 which was rejected in favor of a mailing list-centric workflow.
The patch is based on Git GUI's master branch at
https://github.com/prati0100/git-gui/.
Johannes Schindelin (1):
git gui: fix staging a second line to a 1-line file
lib/diff.tcl | 1 + 1 file changed, 1 insertion(+)
base-commit: 12d29c326551a6570594db525bea42ad9cea8028
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-359%2Fdscho%2Fgit-gui-stage-line-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-359/dscho/git-gui-stage-line-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/359
Signature · 1 line
gitgitgadget
PATCH 1/1 git gui: fix staging a second line to a 1-line file
From: Johannes Schindelin <[email protected]>
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
--- lib/diff.tcl | 1 + 1 file changed, 1 insertion(+)
lib/diff.tcl +1 -0
@@ -698,6 +698,7 @@ proc apply_range_or_line {x y} { set hh [$ui_diff get $i_l "$i_l + 1 lines"] set hh [lindex [split $hh ,] 0] set hln [lindex [split $hh -] 1] + set hln [lindex [split $hln " "] 0] # There is a special situation to take care of. Consider this # hunk:
Signature · 1 line
gitgitgadget
Quoted 27 lines · Johannes Schindelin via GitGitGadget
From: Johannes Schindelin <[email protected]>
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 <[email protected]>--- lib/diff.tcl | 1 + 1 file changed, 1 insertion(+)lib/diff.tcl +0
-0
lib/diff.tcl proc apply_range_or_line {x y} { · line 701
Quoted 4 lines
lib/diff.tcl +1
-0@@ -698,6 +698,7 @@ proc apply_range_or_line {x y} { set hh [$ui_diff get $i_l "$i_l + 1 lines"] set hh [lindex [split $hh ,] 0] set hln [lindex [split $hh -] 1] + set hln [lindex [split $hln " "] 0]
this is already in that master
https://github.com/prati0100/git-gui/blob/60c60b627e81bf84e1cb01729d2ae882178f079d/lib/diff.tcl#L727
Quoted 5 lines
lib/diff.tcl +0
-1# There is a special situation to take care of. Consider this # hunk: --gitgitgadget
Quoted 24 lines · Bert Wesarg
Quoted 22 lines · Johannes Schindelin via GitGitGadget
From: Johannes Schindelin <[email protected]>
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 <[email protected]>--- lib/diff.tcl | 1 + 1 file changed, 1 insertion(+)
Quoted 11 lines
lib/diff.tcl proc apply_range_or_line {x y} { · line 701
Quoted 9 lines
lib/diff.tcl +1
-0@@ -698,6 +698,7 @@ proc apply_range_or_line {x y} { set hh [$ui_diff get $i_l "$i_l + 1 lines"] set hh [lindex [split $hh ,] 0] set hln [lindex [split $hh -] 1] + set hln [lindex [split $hln " "] 0]this is already in that master
Yes, this was recently merged in when I was pulling in some stuff that went directly into git.git's git-gui subtree, instead of making it into git-gui first (thread at [0] in case someone wants to find out more). This commit was one of those. Junio directly merged this commit into git/git-gui, along with some other stuff from Johannes in the commit 02a5f25d95 (Merge branch 'js/misc-git-gui-stuff' of ../git-gui) of git.git.
[0] https://public-inbox.org/git/CAGr--=KXqFbivuXHPNecb3dBR_hx8QqWoR4pBGXy7uOiT+ESbg@mail.gmail.com/
Signature · 2 lines
Regards, Pratyush Yadav
Hi,
Quoted 25 lines · Pratyush Yadav
Quoted 24 lines · Bert Wesarg
Quoted 22 lines · Johannes Schindelin via GitGitGadget
From: Johannes Schindelin <[email protected]>
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 <[email protected]>--- lib/diff.tcl | 1 + 1 file changed, 1 insertion(+)
Quoted 11 lines
Quoted 11 lines
lib/diff.tcl proc apply_range_or_line {x y} { · line 701
Quoted 9 lines
lib/diff.tcl +1
-0@@ -698,6 +698,7 @@ proc apply_range_or_line {x y} { set hh [$ui_diff get $i_l "$i_l + 1 lines"] set hh [lindex [split $hh ,] 0] set hln [lindex [split $hh -] 1] + set hln [lindex [split $hln " "] 0]this is already in that master
Sorry, I thought I had rebased, but I obviously failed to do so.
Ciao,
Johannes
Quoted 15 lines
Yes, this was recently merged in when I was pulling in some stuff that went directly into git.git's git-gui subtree, instead of making it into git-gui first (thread at [0] in case someone wants to find out more). This commit was one of those. Junio directly merged this commit into git/git-gui, along with some other stuff from Johannes in the commit
02a5f25d95(Merge branch 'js/misc-git-gui-stuff' of ../git-gui) of git.git.[0] https://public-inbox.org/git/CAGr--=KXqFbivuXHPNecb3dBR_hx8QqWoR4pBGXy7uOiT+ESbg@mail.gmail.com/
--
Regards,
Pratyush Yadav