{"thread":{"id":"46336","subject":"Re: git-2.13.2: color.branch.local problem","startedAt":"2017-07-09T15:57:41Z","lastAt":"2017-07-09T16:28:20Z","messageCount":2,"participants":["Leo Razoumov","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"324031","messageId":"CADsUFkTgw5AGUafuBDEqRAUgzJeMZnQ1RL-_mz-QfiB=SV-xfA@mail.gmail.com","threadId":"46336","inReplyTo":null,"subject":"Re: git-2.13.2: color.branch.local problem","fromName":"Leo Razoumov","fromEmail":"slonik.az@gmail.com","sentAt":"2017-07-09T15:57:34Z","receivedAt":"2017-07-09T15:57:41Z","isPatch":false,"sender":{"key":"slonik.az@gmail.com","avatar":null},"body":"On Sun, Jul 9, 2017 at 5:57 AM, Jeff King <peff@peff.net> wrote:\n> On Sun, Jul 09, 2017 at 05:28:34AM -0400, Jeff King wrote:\n>\n>> On Sat, Jul 08, 2017 at 03:13:04PM -0400, Leo Razoumov wrote:\n>>\n>> > When I updated from git-2.10.2 to git-2.13.2 my 'color.branch.local'\n>> > config setting gets ignored. Corresponding 'remote' or 'current'\n>> > settings are honored and work as expected\n>>\n>> Looks like this is a regression from the switch to ref-filter in\n>> v2.13.0; it bisects to 949af0684 (branch: use ref-filter printing APIs,\n>> 2017-01-10). It looks like we don't ever use BRANCH_COLOR_LOCAL. The fix\n>> is a little tricky because of another nearby issue. I'll send out a\n>> patch in a moment.\n>\n> Here it is. This is intended for the maint branch.\n>\n>   [1/3]: branch: only perform HEAD check for local branches\n>   [2/3]: branch: use BRANCH_COLOR_LOCAL in ref-filter format\n>   [3/3]: branch: set remote color in ref-filter branch immediately\n>\n>  builtin/branch.c        | 15 +++++++++------\n>  t/t3205-branch-color.sh | 44 ++++++++++++++++++++++++++++++++++++++++++++\n>  2 files changed, 53 insertions(+), 6 deletions(-)\n>  create mode 100755 t/t3205-branch-color.sh\n>\n> -Peff\n\nJeff,\nthanks for a quick fix!\n--Leo\n"},{"id":"324032","messageId":"xmqq37a5a82s.fsf@gitster.mtv.corp.google.com","threadId":"46336","inReplyTo":"CADsUFkTgw5AGUafuBDEqRAUgzJeMZnQ1RL-_mz-QfiB=SV-xfA@mail.gmail.com","subject":"Re: git-2.13.2: color.branch.local problem","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-07-09T16:28:11Z","receivedAt":"2017-07-09T16:28:20Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Leo Razoumov <slonik.az@gmail.com> writes:\n\n> On Sun, Jul 9, 2017 at 5:57 AM, Jeff King <peff@peff.net> wrote:\n>> On Sun, Jul 09, 2017 at 05:28:34AM -0400, Jeff King wrote:\n>>\n>>> On Sat, Jul 08, 2017 at 03:13:04PM -0400, Leo Razoumov wrote:\n>>>\n>>> > When I updated from git-2.10.2 to git-2.13.2 my 'color.branch.local'\n>>> > config setting gets ignored. Corresponding 'remote' or 'current'\n>>> > settings are honored and work as expected\n>>>\n>>> Looks like this is a regression from the switch to ref-filter in\n>>> v2.13.0; it bisects to 949af0684 (branch: use ref-filter printing APIs,\n>>> 2017-01-10). It looks like we don't ever use BRANCH_COLOR_LOCAL. The fix\n>>> is a little tricky because of another nearby issue. I'll send out a\n>>> patch in a moment.\n>>\n>> Here it is. This is intended for the maint branch.\n>>\n>>   [1/3]: branch: only perform HEAD check for local branches\n>>   [2/3]: branch: use BRANCH_COLOR_LOCAL in ref-filter format\n>>   [3/3]: branch: set remote color in ref-filter branch immediately\n>>\n>>  builtin/branch.c        | 15 +++++++++------\n>>  t/t3205-branch-color.sh | 44 ++++++++++++++++++++++++++++++++++++++++++++\n>>  2 files changed, 53 insertions(+), 6 deletions(-)\n>>  create mode 100755 t/t3205-branch-color.sh\n>>\n>> -Peff\n>\n> Jeff,\n> thanks for a quick fix!\n> --Leo\n\nThanks, both.  Will queue.\n"}]}