X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=revision.c;h=de4dce600d00282655907e9014228791a352f813;hb=986c5181071ce3aac42d0aaeb7bd691a1a0bdf4a;hp=0627494378dcf6d921af59cc83d02e6a6feb0030;hpb=1689c22c1c328e9135ed51458e9f9a5d224c5057;p=thirdparty%2Fgit.git

diff --git a/revision.c b/revision.c
index 0627494378..de4dce600d 100644
--- 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;