contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"

diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index 0b21d7e5b297ff3d2d1a73d8a74c8bc37e672ccb..c824d4ec5f1c076e4833c690dad378125dde6da9 100644 (file)
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -87,7 +87,7 @@ static int subpath_matches(const char *path, const char *filter)
        const char *subpath = path;
 
        while (subpath) {
-               if (!fnmatch(filter, subpath, 0))
+               if (!wildmatch(filter, subpath, 0, NULL))
                        return subpath - path;
                subpath = strchr(subpath, '/');
                if (subpath)