From 6d02c1e20471cd8b6923c82e8faacfe43a75b1e1 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 9 Jan 2018 15:32:54 +0100 Subject: [PATCH 1/4] 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 Signed-off-by: Junio C Hamano --- lib/diff.tcl | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/diff.tcl b/lib/diff.tcl index 4cae10a4c7..68c4a6c736 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -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: From 2365e5b17411d50129462c2a1919bedc4fa64c68 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 9 Jan 2018 15:32:58 +0100 Subject: [PATCH 2/4] git-gui: avoid exception upon Ctrl+T in an empty list Previously unstaged files can be staged by clicking on them and then pressing Ctrl+T. Conveniently, the next unstaged file is selected automatically so that the unstaged files can be staged by repeatedly pressing Ctrl+T. When a user hits Ctrl+T one time too many, though, Git GUI used to throw this exception: expected number but got "" expected number but got "" while executing "expr {int([lindex [$w tag ranges in_diff] 0])}" (procedure "toggle_or_diff" line 13) invoked from within "toggle_or_diff toggle .vpane.files.workdir.list " (command bound to event) Let's just avoid that by skipping the operation when there are no more files to stage. This fixes https://github.com/git-for-windows/git/issues/1060 Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- git-gui.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/git-gui.sh b/git-gui.sh index 5bc21b878d..3ce2e04bc5 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -2505,6 +2505,10 @@ proc toggle_or_diff {mode w args} { if {$last_clicked ne {}} { set lno [lindex $last_clicked 1] } else { + if {[llength $file_lists($w)] == 0} { + set last_clicked {} + return + } set lno [expr {int([lindex [$w tag ranges in_diff] 0])}] } if {$mode eq "toggle"} { From 2cd9179c14dc830247a84a602caac42afa0fcf8f Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 9 Jan 2018 15:33:01 +0100 Subject: [PATCH 3/4] git-gui: fix exception when trying to stage with empty file list If there is nothing to stage, there is nothing to stage. Let's not try to, even if the file list contains nothing at all. This fixes https://github.com/git-for-windows/git/issues/1075 Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- git-gui.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/git-gui.sh b/git-gui.sh index 3ce2e04bc5..b3c14acbdf 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -2505,7 +2505,9 @@ proc toggle_or_diff {mode w args} { if {$last_clicked ne {}} { set lno [lindex $last_clicked 1] } else { - if {[llength $file_lists($w)] == 0} { + if {![info exists file_lists] + || ![info exists file_lists($w)] + || [llength $file_lists($w)] == 0} { set last_clicked {} return } @@ -2519,7 +2521,13 @@ proc toggle_or_diff {mode w args} { } } - set path [lindex $file_lists($w) [expr {$lno - 1}]] + if {![info exists file_lists] + || ![info exists file_lists($w)] + || [llength $file_lists($w)] < $lno - 1} { + set path {} + } else { + set path [lindex $file_lists($w) [expr {$lno - 1}]] + } if {$path eq {}} { set last_clicked {} return From 76756d67061076c046973bff2089ad49f5dc2eb6 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 9 Jan 2018 15:33:04 +0100 Subject: [PATCH 4/4] git-gui: allow Ctrl+T to toggle multiple paths It is possible to select multiple files in the "Unstaged Changes" and the "Staged Changes" lists. But when hitting Ctrl+T, surprisingly only one entry is handled, not all selected ones. Let's just use the same code path as for the "Stage To Commit" and the "Unstage From Commit" menu items. This fixes https://github.com/git-for-windows/git/issues/1012 Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- git-gui.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/git-gui.sh b/git-gui.sh index b3c14acbdf..3fc254c37d 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -2502,6 +2502,19 @@ proc toggle_or_diff {mode w args} { set pos [split [$w index @$x,$y] .] foreach {lno col} $pos break } else { + if {$mode eq "toggle"} { + if {$w eq $ui_workdir} { + do_add_selection + set last_clicked {} + return + } + if {$w eq $ui_index} { + do_unstage_selection + set last_clicked {} + return + } + } + if {$last_clicked ne {}} { set lno [lindex $last_clicked 1] } else {