* [PATCH] gitk: Do not mistake unchanged lines with submodule changes
@ 2018-10-21 16:34 Dummy Name
2018-10-21 16:39 ` Gabriele Mazzotta
0 siblings, 1 reply; 4+ messages in thread
From: Dummy Name @ 2018-10-21 16:34 UTC (permalink / raw)
To: git; +Cc: paulus, Gabriele Mazzotta
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] gitk: Do not mistake unchanged lines with submodule changes
2018-10-21 16:34 [PATCH] gitk: Do not mistake unchanged lines with submodule changes Dummy Name
@ 2018-10-21 16:39 ` Gabriele Mazzotta
0 siblings, 0 replies; 4+ messages in thread
From: Gabriele Mazzotta @ 2018-10-21 16:39 UTC (permalink / raw)
To: git; +Cc: paulus
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] gitk: Do not mistake unchanged lines with submodule changes
@ 2019-03-23 17:00 Gabriele Mazzotta
2019-09-15 23:08 ` Paul Mackerras
0 siblings, 1 reply; 4+ messages in thread
From: Gabriele Mazzotta @ 2019-03-23 17:00 UTC (permalink / raw)
To: git; +Cc: paulus, Gabriele Mazzotta
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.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] gitk: Do not mistake unchanged lines with submodule changes
2019-03-23 17:00 Gabriele Mazzotta
@ 2019-09-15 23:08 ` Paul Mackerras
0 siblings, 0 replies; 4+ messages in thread
From: Paul Mackerras @ 2019-09-15 23:08 UTC (permalink / raw)
To: Gabriele Mazzotta; +Cc: git
On Sat, Mar 23, 2019 at 06:00:36PM +0100, Gabriele Mazzotta wrote:
> 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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-09-15 23:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-21 16:34 [PATCH] gitk: Do not mistake unchanged lines with submodule changes Dummy Name
2018-10-21 16:39 ` Gabriele Mazzotta
-- strict thread matches above, loose matches on Subject: below --
2019-03-23 17:00 Gabriele Mazzotta
2019-09-15 23:08 ` Paul Mackerras
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).