From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id DD9EA20357 for ; Sun, 9 Jul 2017 09:57:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752078AbdGIJ5L (ORCPT ); Sun, 9 Jul 2017 05:57:11 -0400 Received: from cloud.peff.net ([104.130.231.41]:34690 "HELO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751160AbdGIJ5K (ORCPT ); Sun, 9 Jul 2017 05:57:10 -0400 Received: (qmail 2745 invoked by uid 109); 9 Jul 2017 09:57:10 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with SMTP; Sun, 09 Jul 2017 09:57:10 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 32265 invoked by uid 111); 9 Jul 2017 09:57:21 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) by peff.net (qpsmtpd/0.94) with SMTP; Sun, 09 Jul 2017 05:57:21 -0400 Authentication-Results: peff.net; auth=none Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Sun, 09 Jul 2017 05:57:08 -0400 Date: Sun, 9 Jul 2017 05:57:08 -0400 From: Jeff King To: Leo Razoumov Cc: Karthik Nayak , Git Mailing List Subject: Re: git-2.13.2: color.branch.local problem Message-ID: <20170709095708.moymrozmqdv2oixx@sigill.intra.peff.net> References: <20170709092834.nxfmqsxieg6boujh@sigill.intra.peff.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20170709092834.nxfmqsxieg6boujh@sigill.intra.peff.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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