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 <[email protected]> --- git-gui/git-gui.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index 3c085cddc61..ca2cdebdc4f 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@ -2504,7 +2504,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 } @@ -2518,7 +2520,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 -- 2.15.1.windows.2.395.g5bb0817ee52
