From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 22 Jan 2007 04:11:47 +0000 (-0500)
Subject: git-gui: Don't format the mode line of a diff.
X-Git-Tag: gitgui-0.6.0~75
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8ce03164842d250f1cf1dfbf9a245fd030195e24;p=git.git

git-gui: Don't format the mode line of a diff.

We sometimes see a mode line show up in a diff if the file mode was
changed.  But its not something we format specially.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/git-gui.sh b/git-gui.sh
index d71fcd822..396a44e65 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -709,6 +709,7 @@ proc read_diff {fd} {
 		if {[string match {@@@ *} $line]} {set is_3way_diff 1}
 
 		if {[string match {index *} $line]
+			|| [string match {mode *} $line]
 			|| [regexp {^\* Unmerged path } $line]} {
 			set tags {}
 		} elseif {$is_3way_diff} {