[PATCH] gitk: Do not mistake unchanged lines with submodule changes
- From
Dummy Name <gabriele.mzt@gmail.com>
- Date
- Oct 21, 2018, 16:34 UTC
- Message-ID
- <20181021163401.4458-1-dummy@example.com>
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(-)
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.19.1