Start moving unpack-trees to "struct tree_desc"

diff --git a/unpack-trees.h b/unpack-trees.h
index 191f7442f10683c8043288eece36f39166fedc95..9cd39a28a907ef6f0eedc764bbae586353ec2ca5 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -16,6 +16,7 @@ struct unpack_trees_options {
        int verbose_update;
        int aggressive;
        const char *prefix;
+       int pos;
        struct dir_struct *dir;
        merge_fn_t fn;
 
@@ -25,7 +26,7 @@ struct unpack_trees_options {
        struct cache_entry *df_conflict_entry;
 };
 
-extern int unpack_trees(struct object_list *trees,
+extern int unpack_trees(unsigned n, struct tree_desc *t,
                struct unpack_trees_options *options);
 
 int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o);