From: Shawn O. Pearce <spearce@spearce.org>
Date: Sun, 21 Jan 2007 19:23:51 +0000 (-0500)
Subject: git-gui: Correctly ignore '* Unmerged path' during diff.
X-Git-Tag: gitgui-0.6.0~88
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=37d2a1c9fa2f94093cb6bd5e6b2aa6a38c95593e;p=git.git

git-gui: Correctly ignore '* Unmerged path' during diff.

If a path is really unmerged, such as because it has been deleted and
also modifed, we cannot obtain a diff for it.  Instead Git is sending
back '* Unmerged path <blah>' for file <blah>.  We should display this
line as-is as our tag selecting switches don't recognize it.

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

diff --git a/git-gui.sh b/git-gui.sh
index d26868bec..8e664f54e 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -708,7 +708,8 @@ proc read_diff {fd} {
 		#
 		if {[string match {@@@ *} $line]} {set is_3way_diff 1}
 
-		if {[string match {index *} $line]} {
+		if {[string match {index *} $line]
+			|| [regexp {^\* Unmerged path } $line]} {
 			set tags {}
 		} elseif {$is_3way_diff} {
 			set op [string range $line 0 1]