aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert Wesarg <bert.wesarg@googlemail.com>2010-12-09 21:47:59 +0100
committerPat Thoyts <patthoyts@users.sourceforge.net>2011-01-28 09:01:17 +0000
commitbf59439847369ce8c1169fdf58aca5ca857dc568 (patch)
tree2e201be5a476ac735b1b9b5c0e771784795e9e2c
parentd1c7f8aa666dfc96743782cba452112c7678e9eb (diff)
downloadgit-bf59439847369ce8c1169fdf58aca5ca857dc568.tar.gz
git-bf59439847369ce8c1169fdf58aca5ca857dc568.tar.xz
git-gui: handle meta diff header lines only in the header section
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
-rw-r--r--lib/diff.tcl9
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/diff.tcl b/lib/diff.tcl
index 4eaf7e7aa..cf8a95ec3 100644
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -423,14 +423,9 @@ proc read_diff {fd conflict_size cont_info} {
# -- Name it symlink, not 120000
# Note, that the original line is in $current_diff_header
regsub {^(deleted|new) file mode 120000} $line {\1 symlink} line
- }
- if {[string match {new file *} $line]
- || [regexp {^(old|new) mode *} $line]
- || [string match {deleted file *} $line]
- || [string match {deleted symlink} $line]
- || [string match {new symlink} $line]
- || $line eq {\ No newline at end of file}} {
+ } elseif { $line eq {\ No newline at end of file}} {
+ # -- Handle some special lines
} elseif {$is_3way_diff} {
set op [string range $line 0 1]
switch -- $op {