tree 3f4eb9c2a3ea2c1603517904d0a731d1e1375ee1
parent ecab58c65f5915869fd84a57e1060e146aaa0be3
parent 5b5c9c3e19eb6afcb987093c705bb5e2e80a63ae
author Junio C Hamano <gitster@pobox.com> 1499898189 -0700
committer Junio C Hamano <gitster@pobox.com> 1499898189 -0700

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

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