From: Paul Mackerras <paulus@samba.org>
Date: Tue, 7 Mar 2006 22:15:32 +0000 (+1100)
Subject: gitk: Fix display of diff lines beginning with --- or +++
X-Git-Tag: v1.3.0-rc1~1^2~1^2~5
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b06bc2a0784cfb5cd9e1313201a16e08c73ff1c6;p=git.git

gitk: Fix display of diff lines beginning with --- or +++

Lines in a diff beginning with --- or +++ were not being displayed
at all.  Thanks to Robert Fitzsimons for pointing out the obvious
fix, that lines beginning with --- or +++ are only to be suppressed
in the diff header.  I also took the opportunity to replace a regexp
call with a couple of string compare calls, which should be faster.

Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/gitk b/gitk
index 36e8647b..3b8ecd03 100755
--- a/gitk
+++ b/gitk
@@ -2615,7 +2615,9 @@ proc getblobdiffline {bdf ids} {
 	set pad [string range "----------------------------------------" 1 $l]
 	$ctext insert end "$pad $header $pad\n" filesep
 	set diffinhdr 1
-    } elseif {[regexp {^(---|\+\+\+)} $line]} {
+    } elseif {$diffinhdr && [string compare -length 3 $line "---"] == 0} {
+	# do nothing
+    } elseif {$diffinhdr && [string compare -length 3 $line "+++"] == 0} {
 	set diffinhdr 0
     } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
 		   $line match f1l f1c f2l f2c rest]} {