Merge branch 'jk/diff-follow-must-take-one-pathspec' into maint

diff --git a/builtin/branch.c b/builtin/branch.c
index b4d771673e7e9dccacbae8b29f4f1cd6a835151f..652b1d2d1484032fab51165f1d0b0a41426d114f 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -315,7 +315,7 @@ static int match_patterns(const char **pattern, const char *refname)
        if (!*pattern)
                return 1; /* no pattern always matches */
        while (*pattern) {
-               if (!fnmatch(*pattern, refname, 0))
+               if (!wildmatch(*pattern, refname, 0, NULL))
                        return 1;
                pattern++;
        }