]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ecab58c 5b5c9c3)
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)
commit55bdfa022f007b5666d923012296f04872a8f3d9
tree3f4eb9c2a3ea2c1603517904d0a731d1e1375ee1tree | snapshot
parentecab58c65f5915869fd84a57e1060e146aaa0be3commit | diff
parent5b5c9c3e19eb6afcb987093c705bb5e2e80a63aecommit | diff
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
builtin/branch.c diff1 | diff2 | blob | history
ref-filter.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.