From: Shawn O. Pearce <spearce@spearce.org>
Date: Tue, 23 Jan 2007 00:18:39 +0000 (-0500)
Subject: git-gui: Ignore 'No newline at end of file' marker line.
X-Git-Tag: gitgui-0.6.0~71
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e54a1bd122007af30fcf174a57f892157501673f;p=git.git

git-gui: Ignore 'No newline at end of file' marker line.

If one or both versions of the file don't have a newline at the end
of the file we get a line telling us so in the diff output.  This
shouldn't be tagged, nor should it generate a warning about not
being tagged.

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

diff --git a/git-gui.sh b/git-gui.sh
index bbf57b96a..54204aee7 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -706,6 +706,7 @@ proc read_diff {fd} {
 			|| [string match {mode *} $line]
 			|| [string match {new file *} $line]
 			|| [string match {deleted file *} $line]
+			|| $line eq {\ No newline at end of file}
 			|| [regexp {^\* Unmerged path } $line]} {
 			set tags {}
 		} elseif {$is_3way_diff} {