Merge branch 'kn/ref-filter-branch-list' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Jul 2017 22:23:09 +0000 (15:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Jul 2017 22:23:09 +0000 (15:23 -0700)
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

1  2 
builtin/branch.c
ref-filter.c

Simple merge
diff --cc ref-filter.c
Simple merge