diff options
| author | Gabriele Mazzotta <gabriele.mzt@gmail.com> | 2019-03-23 20:00:36 +0300 |
|---|---|---|
| committer | Paul Mackerras <paulus@ozlabs.org> | 2019-09-14 02:35:43 +0300 |
| commit | 9ea831a2a6845251b1f322a128d3d35e8b3774c9 (patch) | |
| tree | 2e01b4f1def5a2fa24bed7b6cd9fa3bf60d820db | |
| parent | d7cc4fb0018e247cb5a05cbe55057bc70d3455af (diff) | |
gitk: Do not mistake unchanged lines for submodule changes
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 are listing
the changes of a submodule.
Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
| -rwxr-xr-x | gitk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -8228,11 +8228,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 |