summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 75e78c8)
raw | patch | inline | side by side (parent: 75e78c8)
author | Shawn O. Pearce <spearce@spearce.org> | |
Tue, 23 Jan 2007 00:18:39 +0000 (19:18 -0500) | ||
committer | Shawn O. Pearce <spearce@spearce.org> | |
Tue, 23 Jan 2007 06:48:50 +0000 (01:48 -0500) |
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>
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>
git-gui.sh | patch | blob | history |
diff --git a/git-gui.sh b/git-gui.sh
index bbf57b96a0632ab43722b5f3d6b9e4752dafae6e..54204aee782681674cd005f5c38a7dbe14b45026 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
|| [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} {