From: Leo Razoumov <slonik.az@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Karthik Nayak <karthik.188@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: git-2.13.2: color.branch.local problem
Date: Sun, 9 Jul 2017 11:57:34 -0400 [thread overview]
Message-ID: <CADsUFkTgw5AGUafuBDEqRAUgzJeMZnQ1RL-_mz-QfiB=SV-xfA@mail.gmail.com> (raw)
On Sun, Jul 9, 2017 at 5:57 AM, Jeff King <peff@peff.net> wrote:
> On Sun, Jul 09, 2017 at 05:28:34AM -0400, Jeff King wrote:
>
>> On Sat, Jul 08, 2017 at 03:13:04PM -0400, Leo Razoumov wrote:
>>
>> > When I updated from git-2.10.2 to git-2.13.2 my 'color.branch.local'
>> > config setting gets ignored. Corresponding 'remote' or 'current'
>> > settings are honored and work as expected
>>
>> Looks like this is a regression from the switch to ref-filter in
>> v2.13.0; it bisects to 949af0684 (branch: use ref-filter printing APIs,
>> 2017-01-10). It looks like we don't ever use BRANCH_COLOR_LOCAL. The fix
>> is a little tricky because of another nearby issue. I'll send out a
>> patch in a moment.
>
> Here it is. This is intended for the maint branch.
>
> [1/3]: branch: only perform HEAD check for local branches
> [2/3]: branch: use BRANCH_COLOR_LOCAL in ref-filter format
> [3/3]: branch: set remote color in ref-filter branch immediately
>
> builtin/branch.c | 15 +++++++++------
> t/t3205-branch-color.sh | 44 ++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 53 insertions(+), 6 deletions(-)
> create mode 100755 t/t3205-branch-color.sh
>
> -Peff
Jeff,
thanks for a quick fix!
--Leo
next reply other threads:[~2017-07-09 15:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-09 15:57 Leo Razoumov [this message]
2017-07-09 16:28 ` git-2.13.2: color.branch.local problem Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2017-07-08 19:13 Leo Razoumov
2017-07-09 9:28 ` Jeff King
2017-07-09 9:57 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CADsUFkTgw5AGUafuBDEqRAUgzJeMZnQ1RL-_mz-QfiB=SV-xfA@mail.gmail.com' \
--to=slonik.az@gmail.com \
--cc=git@vger.kernel.org \
--cc=karthik.188@gmail.com \
--cc=peff@peff.net \
/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.
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).