diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-01-22 19:18:39 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-01-23 01:48:50 -0500 |
| commit | e54a1bd122007af30fcf174a57f892157501673f (patch) | |
| tree | 092ad57ae3f4c57f9b58c642cb215d1a7df12a9b | |
| parent | 75e78c8a1bb273461c14a5b37f9b06215f502e67 (diff) | |
| download | git-e54a1bd122007af30fcf174a57f892157501673f.tar.gz git-e54a1bd122007af30fcf174a57f892157501673f.tar.xz | |
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>
| -rwxr-xr-x | git-gui.sh | 1 |
1 files changed, 1 insertions, 0 deletions
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} { |