1
0
mirror of https://github.com/git/git.git synced 2024-11-18 15:14:36 +01:00

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>
This commit is contained in:
Shawn O. Pearce 2007-01-22 19:18:39 -05:00
parent 75e78c8a1b
commit e54a1bd122

@ -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} {