]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'kn/ref-filter-branch-list'
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Jul 2017 22:18:23 +0000 (15:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Jul 2017 22:18:23 +0000 (15:18 -0700)
commit768d0fe0dadbffe722fa4b80b2180a4fcaf1c854
treeac1c34d58d1f8f01ff655e5915fdef074c7d04ac
parent536c1ec32a37eb221182aaace9c8a6abe960dda1
parent5b5c9c3e19eb6afcb987093c705bb5e2e80a63ae
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
builtin/branch.c
ref-filter.c