[PATCH] describe: match pattern for lightweight tags too
From: Michael Dressel <hidden>
Date: 2016-06-15 22:44:41
Subsystem:
the rest · Maintainer:
Linus Torvalds
So far git describe --match <pattern> would apply the <pattern> only to tag objects not to lightweight tags. This change make describe apply the <pattern> to lightweight tags too. Signed-off-by: Michael Dressel <redacted> --- builtin-describe.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/builtin-describe.c b/builtin-describe.c
index df554b3..3da99c1 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;
--
1.5.5.3