summaryrefslogtreecommitdiff
path: root/git-gui
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2006-11-19 06:06:42 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2006-11-19 06:06:42 (GMT)
commit0d5709cf88e9f242e0e31ccbda42a1c827c90a22 (patch)
treebb16b5121f1882a5e247ae0a77c9b0f3799fbfa1 /git-gui
parent86291555c94300b057a156d87239a6cab09511b3 (diff)
downloadgit-0d5709cf88e9f242e0e31ccbda42a1c827c90a22.zip
git-0d5709cf88e9f242e0e31ccbda42a1c827c90a22.tar.gz
git-0d5709cf88e9f242e0e31ccbda42a1c827c90a22.tar.bz2
git-gui: Describe deleted symlinks in a more friendly way.
Currently core-git's diff utilities report a deleted symlink as a deleted file with a mode of 120000. This is not nearly as user friendly as one might like, as the user must remember that 120000 is the UNIX mode bits for a symlink. So instead we transform the not-so-friendly message from core-git into a slightly more user friendly "deleted symlink" message. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'git-gui')
-rwxr-xr-xgit-gui3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-gui b/git-gui
index bd22125..3f7e408 100755
--- a/git-gui
+++ b/git-gui
@@ -628,6 +628,9 @@ proc read_diff {fd} {
if {[string match {diff --combined *} $line]} continue
if {[string match {--- *} $line]} continue
if {[string match {+++ *} $line]} continue
+ if {$line eq {deleted file mode 120000}} {
+ set line "deleted symlink"
+ }
if {[string match index* $line]} {
if {[string first , $line] >= 0} {
set diff_3way 1