X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=revision.c;h=84ccc0529b75508be5d1603a9e73790ca2b102fe;hb=9e8a901e6b9130ccec149c987e15e55b017a7b29;hp=2f0142f22e21d7cfb1c74ca7035ee962e16dbd9e;hpb=533a05f63ac110c17d4b3d6f6472b504a9ec8f92;p=~andy%2Fgit

diff --git a/revision.c b/revision.c
index 2f0142f22..84ccc0529 100644
--- a/revision.c
+++ b/revision.c
@@ -1358,7 +1358,7 @@ static void prepare_show_merge(struct rev_info *revs)
 	if (!active_nr)
 		read_cache();
 	for (i = 0; i < active_nr; i++) {
-		struct cache_entry *ce = active_cache[i];
+		const struct cache_entry *ce = active_cache[i];
 		if (!ce_stage(ce))
 			continue;
 		if (ce_path_match(ce, &revs->prune_data)) {