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>
Bert Wesarg committed
Dec 9, 2010 at 21:47 UTC
bf59439847369ce8c1169fdf58aca5ca857dc568
1 file changed
+2
-7
lib/diff.tcl
+2
-7
@@ -423,14 +423,9 @@ proc read_diff {fd conflict_size cont_info} {
423
# -- Name it symlink, not 120000
424
# Note, that the original line is in $current_diff_header
425
regsub {^(deleted|new) file mode 120000} $line {\1 symlink} line
426
- }
426
428
- if {[string match {new file *} $line]
429
- || [regexp {^(old|new) mode *} $line]
430
- || [string match {deleted file *} $line]
431
- || [string match {deleted symlink} $line]
432
- || [string match {new symlink} $line]
433
- || $line eq {\ No newline at end of file}} {
427
+ } elseif { $line eq {\ No newline at end of file}} {
428
+ # -- Handle some special lines
429
} elseif {$is_3way_diff} {
430
set op [string range $line 0 1]
431
switch -- $op {