From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Thu, 9 Dec 2010 20:47:53 +0000 (+0100)
Subject: git-gui: handle index lines only in the diff header
X-Git-Tag: gitgui-0.14.0~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ebd143ff999f40996832e9c221c41cb609578cd1;p=git.git

git-gui: handle index lines only in the diff header

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 dae6ca683..0b72924f7 100644
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -402,12 +402,12 @@ proc read_diff {fd conflict_size cont_info} {
 			    || [string match {diff --cc *}       $line]
 			    || [string match {diff --combined *} $line]
 			    || [string match {--- *}             $line]
-			    || [string match {+++ *}             $line]} {
+			    || [string match {+++ *}             $line]
+			    || [string match {index *}           $line]} {
 				continue
 			}
 		}
 
-		if {[string match {index *} $line]} continue
 		if {$line eq {deleted file mode 120000}} {
 			set line "deleted symlink"
 		}