Merge branch 'jc/fetch-sorted' into next

diff --git a/builtin-grep.c b/builtin-grep.c
index d09ddf04850baa17842975ff54063f5acfce8cfe..53de8a883607157c88d02a30f0320aa9e5c0581a 100644 (file)
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -518,7 +518,7 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached)
        argc = nr;
        for (i = 0; i < active_nr; i++) {
                struct cache_entry *ce = active_cache[i];
-               const char *name;
+               char *name;
                if (ce_stage(ce) || !S_ISREG(ntohl(ce->ce_mode)))
                        continue;
                if (!pathspec_matches(paths, ce->name))