Merge branch 'kw/commit-keep-index-when-pre-commit-is-not-run' into next

diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index 7fc7e66e8500b82cbfecc21a1dce77e09de28ab0..c41ea7c2a62ba868061884e511256c24f4d020d9 100644 (file)
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -1,5 +1,6 @@
 #include "builtin.h"
 #include "cache.h"
+#include "config.h"
 #include "commit.h"
 #include "tag.h"
 #include "refs.h"
@@ -129,7 +130,7 @@ static int subpath_matches(const char *path, const char *filter)
        const char *subpath = path;
 
        while (subpath) {
-               if (!wildmatch(filter, subpath, 0, NULL))
+               if (!wildmatch(filter, subpath, 0))
                        return subpath - path;
                subpath = strchr(subpath, '/');
                if (subpath)