diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-20 13:30:01 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-20 13:30:01 +0900 |
| commit | 3445c3dd723b222d5ceda07b13d092d73428012e (patch) | |
| tree | efdf48b07bd250e14265b17e0a58e2bd911a56e5 /builtin | |
| parent | The eighth batch for 2.15 (diff) | |
| parent | describe: fix matching to actually match all patterns (diff) | |
| download | git-3445c3dd723b222d5ceda07b13d092d73428012e.tar.gz git-3445c3dd723b222d5ceda07b13d092d73428012e.zip | |
Merge branch 'jk/describe-omit-some-refs' into mk/describe-match-with-all
* jk/describe-omit-some-refs:
describe: fix matching to actually match all patterns
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/describe.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/builtin/describe.c b/builtin/describe.c index e77163e909..3dc1836480 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -158,18 +158,21 @@ static int get_name(const char *path, const struct object_id *oid, int flag, voi * pattern. */ if (patterns.nr) { + int found = 0; struct string_list_item *item; if (!is_tag) return 0; for_each_string_list_item(item, &patterns) { - if (!wildmatch(item->string, path + 10, 0)) + if (!wildmatch(item->string, path + 10, 0)) { + found = 1; break; + } + } - /* If we get here, no pattern matched. */ + if (!found) return 0; - } } /* Is it annotated? */ |