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>
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 @@
* 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;
