From: Paul Mackerras <paulus@ozlabs.org>
To: "Роман Донченко" <dpb@corrigendum.ru>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] gitk: don't highlight files after submodules as submodules
Date: Sun, 15 Dec 2019 15:39:26 +1100 [thread overview]
Message-ID: <20191215043926.GE12512@blackberry> (raw)
In-Reply-To: <20191101233427.4108-1-dpb@corrigendum.ru>
On Sat, Nov 02, 2019 at 02:34:27AM +0300, Роман Донченко wrote:
> gitk applies submodule highlighting (coloring lines starting with
> " >" and " <") when `currdiffsubmod` is not an empty string.
> However, it fails to reset `currdiffsubmod` after a submodule diff
> ends, so any file diffs following a submodule diff will still be
> highlighted as if they were submodule diffs.
>
> There are two problems with the way gitk tries to reset `currdiffsubmod`:
>
> 1. The code says `set $currdiffsubmod` instead of `set currdiffsubmod`,
> so it actually sets the variable whose name is the submodule path
> instead.
>
> 2. It tries to do it after the first line in a submodule diff, which
> is incorrect, since submodule diffs can contain multiple lines.
>
> Fix this by resetting `currdiffsubmod` when a file diff starts.
>
> Signed-off-by: Роман Донченко <dpb@corrigendum.ru>
Thanks, patch applied.
Paul.
prev parent reply other threads:[~2019-12-15 5:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-01 23:34 [PATCH] gitk: don't highlight files after submodules as submodules Роман Донченко
2019-12-15 4:39 ` Paul Mackerras [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191215043926.GE12512@blackberry \
--to=paulus@ozlabs.org \
--cc=dpb@corrigendum.ru \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 NNTP newsgroup(s).