From 4ed19a3c178d22fbd424af78b42b65533a8d1ebb Mon Sep 17 00:00:00 2001 From: Michael Dressel Date: Wed, 4 Jun 2008 21:06:31 +0200 Subject: describe: match pattern for lightweight tags too The 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 Acked-by: Shawn O. Pearce Signed-off-by: Junio C Hamano --- builtin-describe.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'builtin-describe.c') 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; -- cgit v1.2.1