diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-04 13:15:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-04 13:15:59 -0700 |
| commit | 60727b5800d7791e5b107620cb5b2d344cf97fe9 (patch) | |
| tree | d9ebba045b5ce3c1359d9b84565a76320d858abb /builtin-describe.c | |
| parent | de5825cc829a5d535de726eb7e5af45c0a3b88ce (diff) | |
| parent | 4ed19a3c178d22fbd424af78b42b65533a8d1ebb (diff) | |
| download | git-60727b5800d7791e5b107620cb5b2d344cf97fe9.tar.gz | |
Merge branch 'maint'
* maint:
describe: match pattern for lightweight tags too
Diffstat (limited to 'builtin-describe.c')
| -rw-r--r-- | builtin-describe.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/builtin-describe.c b/builtin-describe.c index df554b30af..3da99c1d06 100644 --- a/builtin-describe.c +++ b/builtin-describe.c @@ -80,12 +80,13 @@ static int get_name(const char *path, const unsigned char *sha1, int flag, void * Otherwise only annotated tags are used. */ if (might_be_tag) { - if (is_tag) { + if (is_tag) prio = 2; - if (pattern && fnmatch(pattern, path + 10, 0)) - prio = 0; - } else + else prio = 1; + + if (pattern && fnmatch(pattern, path + 10, 0)) + prio = 0; } else prio = 0; |