git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 2/4] git-gui: avoid exception upon Ctrl+T in an empty list

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jan 9, 2018, 14:32 UTC
Message-ID
<7cd5ed902e3d8102903d494ba3450b1d745928a9.1515508360.git.johannes.schindelin@gmx.de>
In-Reply-To
<cover.1515508360.git.johannes.schindelin@gmx.de>

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 <johannes.schindelin@gmx.de>
---
 git-gui/git-gui.sh | 4 ++++
 1 file changed, 4 insertions(+)
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index ed24aa9d2f1..3c085cddc61 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -2504,6 +2504,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"} {
-- 
2.15.1.windows.2.395.g5bb0817ee52
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 3 of 8 in “"Fast-"track Git GUI changes”
  1. 0/4 "Fast-"track Git GUI changesJohannes Schindelin, Jan 9, 2018
  2. 1/4 git gui: fix staging a second line to a 1-line fileJohannes Schindelin, Jan 9, 2018
  3. 2/4 git-gui: avoid exception upon Ctrl+T in an empty listJohannes Schindelin, Jan 9, 2018
  4. 3/4 git-gui: fix exception when trying to stage with empty file listJohannes Schindelin, Jan 9, 2018
  5. 4/4 git-gui: allow Ctrl+T to toggle multiple pathsJohannes Schindelin, Jan 9, 2018
  6. Junio C HamanoJan 9, 2018
  7. Junio C HamanoJan 9, 2018
  8. Johannes SchindelinJan 10, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.