From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Jul 2017 22:18:23 +0000 (-0700)
Subject: Merge branch 'kn/ref-filter-branch-list'
X-Git-Tag: v2.14.0-rc0~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=768d0fe0dadbffe722fa4b80b2180a4fcaf1c854;p=thirdparty%2Fgit.git

Merge branch 'kn/ref-filter-branch-list'

The rewrite of "git branch --list" using for-each-ref's internals
that happened in v2.13 regressed its handling of color.branch.local;
this has been fixed.

* kn/ref-filter-branch-list:
  ref-filter.c: drop return from void function
  branch: set remote color in ref-filter branch immediately
  branch: use BRANCH_COLOR_LOCAL in ref-filter format
  branch: only perform HEAD check for local branches
---

768d0fe0dadbffe722fa4b80b2180a4fcaf1c854