diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-12 22:18:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-12 22:18:23 (GMT) |
| commit | 768d0fe0dadbffe722fa4b80b2180a4fcaf1c854 (patch) | |
| tree | ac1c34d58d1f8f01ff655e5915fdef074c7d04ac /ref-filter.c | |
| parent | 536c1ec32a37eb221182aaace9c8a6abe960dda1 (diff) | |
| parent | 5b5c9c3e19eb6afcb987093c705bb5e2e80a63ae (diff) | |
| download | git-768d0fe0dadbffe722fa4b80b2180a4fcaf1c854.zip git-768d0fe0dadbffe722fa4b80b2180a4fcaf1c854.tar.gz git-768d0fe0dadbffe722fa4b80b2180a4fcaf1c854.tar.bz2 | |
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
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 e0578d8..ae6ecbd 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) |