Merge branch 'fc/mergetool-prompt'

diff --git a/builtin/describe.c b/builtin/describe.c
index dadd999c41f6aebe488d057e94e239dfb7dffaec..24d740c8b1705f9c8993bd808c9a618acecc300c 100644 (file)
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -138,7 +138,7 @@ static int get_name(const char *path, const unsigned char *sha1, int flag, void
                return 0;
 
        /* Accept only tags that match the pattern, if given */
-       if (pattern && (!is_tag || fnmatch(pattern, path + 10, 0)))
+       if (pattern && (!is_tag || wildmatch(pattern, path + 10, 0, NULL)))
                return 0;
 
        /* Is it annotated? */