git-gui: Trim trailing slashes from untracked submodule names

spearce · spearce · commit 893841018931 · 2007-09-09T20:39:47.000-04:00
Oddly enough `git ls-files --others` supplies us the name of an
untracked submodule by including the trailing slash but that
same git version will not accept the name with a trailing slash
through `git update-index --stdin`.  Stripping off that final
slash character before loading it into our file lists allows
git-gui to stage changes to submodules just like any other file.

This change should give git-gui users some basic submodule support,
but it is strictly at the plumbing level as we do not actually know
about calling the git-submodule porcelain that is a recent addition
to git 1.5.3.

Signed-off-by: Shawn O. Pearce &lt;spearce@spearce.org&gt;
diff --git a/git-gui.sh b/git-gui.sh
@@ -1010,7 +1010,11 @@ proc read_ls_others {fd after} {
 	set pck [split $buf_rlo "\0"]
 	set buf_rlo [lindex $pck end]
 	foreach p [lrange $pck 0 end-1] {
-		merge_state [encoding convertfrom $p] ?O
+		set p [encoding convertfrom $p]
+		if {[string index $p end] eq {/}} {
+			set p [string range $p 0 end-1]
+		}
+		merge_state $p ?O
 	}
 	rescan_done $fd buf_rlo $after
 }

Original file line number	Diff line number	Diff line change
`@@ -1010,7 +1010,11 @@ proc read_ls_others {fd after} {`
`1010`	`1010`	`set pck [split $buf_rlo "\0"]`
`1011`	`1011`	`set buf_rlo [lindex $pck end]`
`1012`	`1012`	`foreach p [lrange $pck 0 end-1] {`
`1013`		`- merge_state [encoding convertfrom $p] ?O`
	`1013`	`+ set p [encoding convertfrom $p]`
	`1014`	`+ if {[string index $p end] eq {/}} {`
	`1015`	`+ set p [string range $p 0 end-1]`
	`1016`	`+ }`
	`1017`	`+ merge_state $p ?O`
`1014`	`1018`	`}`
`1015`	`1019`	`rescan_done $fd buf_rlo $after`
`1016`	`1020`	`}`