diff mbox series

gitk: Do not mistake unchanged lines with submodule changes

Message ID 20181021163401.4458-1-dummy@example.com
State New, archived
Headers show
Series gitk: Do not mistake unchanged lines with submodule changes | expand

Commit Message

Gabriele Mazzotta Oct. 21, 2018, 4:34 p.m. UTC
From: Gabriele Mazzotta <gabriele.mzt@gmail.com>

Unchanged lines are prefixed with a white-space, thus unchanged lines
starting with either " <" or " >" are mistaken for submodule changes.
Check if a line starts with either "  <" or "  >" only if we listing
the changes of a submodule.

Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>
---
 gitk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Gabriele Mazzotta Oct. 21, 2018, 4:39 p.m. UTC | #1
On 21/10/18 18:34, Dummy Name wrote:
> From: Gabriele Mazzotta <gabriele.mzt@gmail.com>
> 
> Unchanged lines are prefixed with a white-space, thus unchanged lines
> starting with either " <" or " >" are mistaken for submodule changes.
> Check if a line starts with either "  <" or "  >" only if we listing
> the changes of a submodule.
> 
> Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>

Hi,

I accidentally pressed Enter before I could set the committer
to the correct value. I can resend the patch if necessary.

Regards,
Gabriele
diff mbox series

Patch

diff --git a/gitk b/gitk
index a14d7a1..dd4bbbf 100755
--- a/gitk
+++ b/gitk
@@ -8191,11 +8191,11 @@  proc parseblobdiffline {ids line} {
 	} else {
 	    $ctext insert end "$line\n" filesep
 	}
-    } elseif {![string compare -length 3 "  >" $line]} {
+    } elseif {$currdiffsubmod != "" && ![string compare -length 3 "  >" $line]} {
 	set $currdiffsubmod ""
 	set line [encoding convertfrom $diffencoding $line]
 	$ctext insert end "$line\n" dresult
-    } elseif {![string compare -length 3 "  <" $line]} {
+    } elseif {$currdiffsubmod != "" && ![string compare -length 3 "  <" $line]} {
 	set $currdiffsubmod ""
 	set line [encoding convertfrom $diffencoding $line]
 	$ctext insert end "$line\n" d0