diff options
| author | Michael Dressel <MichaelTiloDressel@t-online.de> | 2008-06-04 21:06:31 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-04 13:08:03 -0700 |
| commit | 4ed19a3c178d22fbd424af78b42b65533a8d1ebb (patch) | |
| tree | a190332ce9ec7b4e6a614a6335a2cae255faa3e5 /builtin-describe.c | |
| parent | 28bc30220f30850a10217d61f73e46d8a541e670 (diff) | |
| download | git-4ed19a3c178d22fbd424af78b42b65533a8d1ebb.tar.gz | |
describe: match pattern for lightweight tags too
The <pattern> given "git describe --match" was used only to filter tag
objects, and not to filter lightweight tags. This fixes it.
[jc: made the log to clarify this is a bugfix, not an enhancement, with
additional test]
Signed-off-by: Michael Dressel <MichaelTiloDressel@t-online.de>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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; |