Merge branch 'sg/test-must-be-empty'

[thirdparty/git.git] / revision.c

diff --git a/revision.c b/revision.c
index 0627494378dcf6d921af59cc83d02e6a6feb0030..de4dce600d00282655907e9014228791a352f813 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1517,7 +1517,7 @@ static void prepare_show_merge(struct rev_info *revs)
                const struct cache_entry *ce = active_cache[i];
                if (!ce_stage(ce))
                        continue;
-               if (ce_path_match(ce, &revs->prune_data, NULL)) {
+               if (ce_path_match(&the_index, ce, &revs->prune_data, NULL)) {
                        prune_num++;
                        REALLOC_ARRAY(prune, prune_num);
                        prune[prune_num-2] = ce->name;