[PATCH 8/8] git-gui: handle meta diff header lines only in the header section
From: Bert Wesarg <hidden>
Date: 2016-06-15 22:50:13
Subsystem:
library code, the rest · Maintainers:
Andrew Morton, Linus Torvalds
Signed-off-by: Bert Wesarg <redacted> --- lib/diff.tcl | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/lib/diff.tcl b/lib/diff.tcl
index 4eaf7e7..cf8a95e 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 {
--
1.7.3.2.1200.ge4bf6