From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 10 Sep 2007 00:56:04 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: gitgui-0.9.0~80
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5f51ccd2598977694d383e9059e89cafb9ae1214;p=git.git

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
---

5f51ccd2598977694d383e9059e89cafb9ae1214
diff --cc lib/diff.tcl
index b1129d551,694834ab7..d01340964
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@@ -98,7 -116,9 +116,12 @@@ proc show_diff {path w {lno {}}} 
  			return
  		}
  		$ui_diff conf -state normal
- 		if {![catch {set type [exec file $path]}]} {
+ 		if {$type eq {submodule}} {
 -			$ui_diff insert end "* Git Repository (subproject)\n" d_@
++			$ui_diff insert end [append \
++				"* " \
++				[mc "Git Repository (subproject)"] \
++				"\n"] d_@
+ 		} elseif {![catch {set type [exec file $path]}]} {
  			set n [string length $path]
  			if {[string equal -length $n $path $type]} {
  				set type [string range $type $n end]