diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-07-13 01:23:09 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-07-13 01:23:09 +0300 |
commit | 55bdfa022f007b5666d923012296f04872a8f3d9 (patch) | |
tree | 3f4eb9c2a3ea2c1603517904d0a731d1e1375ee1 /ref-filter.c | |
parent | ecab58c65f5915869fd84a57e1060e146aaa0be3 (diff) | |
parent | 5b5c9c3e19eb6afcb987093c705bb5e2e80a63ae (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
Diffstat (limited to 'ref-filter.c')
-rw-r--r-- | ref-filter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ref-filter.c b/ref-filter.c index 2cc7b01277..467c0279c9 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -221,7 +221,7 @@ static void objectname_atom_parser(struct used_atom *atom, const char *arg) static void refname_atom_parser(struct used_atom *atom, const char *arg) { - return refname_atom_parser_internal(&atom->u.refname, arg, atom->name); + refname_atom_parser_internal(&atom->u.refname, arg, atom->name); } static align_type parse_align_position(const char *s) |