git-gui: handle meta diff header lines only in the header section

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

diff --git a/lib/diff.tcl b/lib/diff.tcl
index 4eaf7e7aa21d4b867ef42ce29b387d93e238c4d8..cf8a95ec346a9a8afa60a3812d59a8caa4bb4c3f 100644 (file)
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -423,14 +423,9 @@ proc read_diff {fd conflict_size cont_info} {
                        # -- Name it symlink, not 120000
                        #    Note, that the original line is in $current_diff_header
                        regsub {^(deleted|new) file mode 120000} $line {\1 symlink} line
                        # -- Name it symlink, not 120000
                        #    Note, that the original line is in $current_diff_header
                        regsub {^(deleted|new) file mode 120000} $line {\1 symlink} line

-               }

 
 

-               if {[string match {new file *} $line]
-                       || [regexp {^(old|new) mode *} $line]
-                       || [string match {deleted file *} $line]
-                       || [string match {deleted symlink} $line]
-                       || [string match {new symlink} $line]
-                       || $line eq {\ No newline at end of file}} {
+               } elseif {   $line eq {\ No newline at end of file}} {
+                       # -- Handle some special lines

                } elseif {$is_3way_diff} {
                        set op [string range $line 0 1]
                        switch -- $op {
                } elseif {$is_3way_diff} {
                        set op [string range $line 0 1]
                        switch -- $op {