[PATCH] gitk: Do not mistake unchanged lines with submodule changes

Gabriele Mazzotta· Mar 23, 2019, 17:00 UTC · lore

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(-)

Show changes to gitk +2 −2

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

-- 
2.20.1

Paul Mackerras· Sep 15, 2019, 23:08 UTC · re: Gabriele Mazzotta · lore

Re: [PATCH] gitk: Do not mistake unchanged lines with submodule changes

On Sat, Mar 23, 2019 at 06:00:36PM +0100, Gabriele Mazzotta wrote:

Show 6 quoted lines

> 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>

Thanks, patch applied to my git://ozlabs.org/~paulus/gitk.git repository.

Paul.

patchgitk: Do not mistake unchanged lines with submodule changes