From e54a1bd122007af30fcf174a57f892157501673f Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Mon, 22 Jan 2007 19:18:39 -0500 Subject: [PATCH] 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 --- git-gui.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-gui.sh b/git-gui.sh index bbf57b96a0..54204aee78 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} { -- 2.11.4.GIT