Merge branch 'ma/hg-to-git'

diff --git a/revision.c b/revision.c
index 2f0142f22e21d7cfb1c74ca7035ee962e16dbd9e..84ccc0529b75508be5d1603a9e73790ca2b102fe 100644 (file)
--- 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)) {