Merge branch 'nd/warn-ambiguous-object-name'

diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index b847486cba628988d431d61fbdc728747f82c2e1..0f5d7fe23f5b1e15e24e93daed68ece7542cf104 100644 (file)
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -80,7 +80,8 @@ static void debug_stage(const char *label, const struct cache_entry *ce,
                       sha1_to_hex(ce->sha1));
 }
 
-static int debug_merge(struct cache_entry **stages, struct unpack_trees_options *o)
+static int debug_merge(const struct cache_entry * const *stages,
+                      struct unpack_trees_options *o)
 {
        int i;