Merge branch 'js/blame-parsename'

diff --git a/cache.h b/cache.h
index 28899b7b7881474eed4a6f3b6fda8db79d5cbc9c..5b896d9845bca12c2c1486618e653491f08617c3 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -511,7 +511,7 @@ struct pathspec {
        struct pathspec_item {
                const char *match;
                int len;
-               unsigned int has_wildcard:1;
+               unsigned int use_wildcard:1;
        } *items;
 };