summaryrefslogtreecommitdiff
path: root/git-gui.sh
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-09-10 00:56:04 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-09-10 01:02:57 (GMT)
commit5f51ccd2598977694d383e9059e89cafb9ae1214 (patch)
tree8dc3b020c388cecb38039108ef149bd7a2a40f52 /git-gui.sh
parentb2bd31006f02debe1ddf4fa8b73c52281516a871 (diff)
parent8938410189315979255c1dfcc3c0b7a4bf9953e5 (diff)
downloadgit-5f51ccd2598977694d383e9059e89cafb9ae1214.zip
git-5f51ccd2598977694d383e9059e89cafb9ae1214.tar.gz
git-5f51ccd2598977694d383e9059e89cafb9ae1214.tar.bz2
Merge branch 'maint'
* maint: git-gui: Trim trailing slashes from untracked submodule names git-gui: Assume untracked directories are Git submodules git-gui: handle "deleted symlink" diff marker git-gui: show unstaged symlinks in diff viewer
Diffstat (limited to 'git-gui.sh')
-rwxr-xr-xgit-gui.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/git-gui.sh b/git-gui.sh
index daab7e4..36ba849 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1029,7 +1029,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
}