From: Shawn O. Pearce <spearce@spearce.org>
Date: Tue, 23 Jan 2007 08:25:17 +0000 (-0500)
Subject: git-gui: Don't try to tag the 'Binary files * and * differ' line.
X-Git-Tag: gitgui-0.6.0~66
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4e62e2725e487b515a57e1c6ae5ef9b81546884d;p=git.git

git-gui: Don't try to tag the 'Binary files * and * differ' line.

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

diff --git a/git-gui.sh b/git-gui.sh
index 37757cfb6..c6757045a 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -734,6 +734,7 @@ proc read_diff {fd} {
 			|| [string match {mode *} $line]
 			|| [string match {new file *} $line]
 			|| [string match {deleted file *} $line]
+			|| [string match {Binary files * and * differ} $line]
 			|| $line eq {\ No newline at end of file}
 			|| [regexp {^\* Unmerged path } $line]} {
 			set tags {}