git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git-2.13.2: color.branch.local problem

From
LRLeo Razoumov <slonik.az@gmail.com>
Date
Jul 9, 2017, 15:57 UTC
Message-ID
<CADsUFkTgw5AGUafuBDEqRAUgzJeMZnQ1RL-_mz-QfiB=SV-xfA@mail.gmail.com>
On Sun, Jul 9, 2017 at 5:57 AM, Jeff King <peff@peff.net> wrote:
Show 26 quoted lines
> 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: Junio C Hamano
Message 1 of 2 in “Re: git-2.13.2: color.branch.local problem”
  1. Leo RazoumovJul 9, 2017
  2. Junio C HamanoJul 9, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.