]> asedeno.scripts.mit.edu Git - git.git/commitdiff
git-gui: Describe deleted symlinks in a more friendly way.
authorShawn O. Pearce <spearce@spearce.org>
Sun, 19 Nov 2006 06:06:42 +0000 (01:06 -0500)
committerShawn O. Pearce <spearce@spearce.org>
Sun, 19 Nov 2006 06:06:42 +0000 (01:06 -0500)
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>
git-gui

diff --git a/git-gui b/git-gui
index bd22125e5130207871446c73863be23e2ed962f6..3f7e40835656bac8ac6eeab1af43d4ca74fdeec5 100755 (executable)
--- 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