diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-01-22 18:24:45 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-01-23 01:48:49 -0500 |
| commit | e0c781b34756ce47ab9a6ae89eba8067733d6e5c (patch) | |
| tree | 85c2917904c340c55f1f72e68cf0f4c8065124c5 | |
| parent | 46aaf90b4901cbae9da9d59ba8cc914dcfc38aa3 (diff) | |
| download | git-e0c781b34756ce47ab9a6ae89eba8067733d6e5c.tar.xz | |
git-gui: Don't attempt to tag new file/deleted file headers in diffs.
We don't want to tag these new file/delete file lines, as they aren't
actually that interesting. Its quite clear from the diff itself that
the file is a new file or is a deleted file (as the entire thing will
appear in the diff).
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| -rwxr-xr-x | git-gui.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-gui.sh b/git-gui.sh index 2350baa3a3..d697d1ebe2 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -704,6 +704,8 @@ proc read_diff {fd} { if {[string match {index *} $line] || [string match {mode *} $line] + || [string match {new file *} $line] + || [string match {deleted file *} $line] || [regexp {^\* Unmerged path } $line]} { set tags {} } elseif {$is_3way_diff} { |