path: root/unpack-trees.h
diff options
authorLinus Torvalds <>2007-08-10 05:21:29 (GMT)
committerJunio C Hamano <>2007-08-10 09:30:44 (GMT)
commit933bf40a5c6328b6c022b636f45a6f2c48c3838e (patch)
tree246435d354ef5842d922aad8be571f2a1b1f973c /unpack-trees.h
parent7efeb8f09866ddd09485c0e6f371a6cbba3d2a0a (diff)
Start moving unpack-trees to "struct tree_desc"
This doesn't actually change any real code, but it changes the interface to unpack_trees() to take an array of "struct tree_desc" entries, the same way the tree-walk.c functions do. The reason for this is that we would be much better off if we can do the tree-unpacking using the generic "traverse_trees()" functionality instead of having to the special "unpack" infrastructure. This really is a pretty minimal diff, just to change the calling convention. It passes all the tests, and looks sane. There were only two users of "unpack_trees()": builtin-read-tree and merge-recursive, and I tried to keep the changes minimal. Signed-off-by: Linus Torvalds <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'unpack-trees.h')
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.h b/unpack-trees.h
index fee7da4..9cd39a2 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -26,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);