From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Thu, 9 Dec 2010 20:47:59 +0000 (+0100)
Subject: git-gui: handle meta diff header lines only in the header section
X-Git-Tag: gitgui-0.14.0~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bf59439847369ce8c1169fdf58aca5ca857dc568?ds=inline;hp=--cc

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

bf59439847369ce8c1169fdf58aca5ca857dc568
diff --git a/lib/diff.tcl b/lib/diff.tcl
index 4eaf7e7aa2..cf8a95ec34 100644
--- 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
-		}
 
-		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 {