merge: fix NULL pointer dereference when merging nothing into void

diff --git a/builtin/grep.c b/builtin/grep.c
index 95ddf96d1e416f59dff08a9dde71b04cdb2b6ccd..65c02010c735ad6c5528dab2087d473e1c8b2362 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -375,7 +375,7 @@ static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec, int
 
        for (nr = 0; nr < active_nr; nr++) {
                const struct cache_entry *ce = active_cache[nr];
-               if (!S_ISREG(ce->ce_mode))
+               if (!S_ISREG(ce->ce_mode) || ce_intent_to_add(ce))
                        continue;
                if (!ce_path_match(ce, pathspec, NULL))
                        continue;