Merge branch 'js/rebase-merge-octopus'

diff --git a/tree.h b/tree.h
index e2a80be4ef87e35d895e8591a0f8a75df347d347..d4807dc805827e6fe07fd01721a8a4680af3403f 100644 (file)
--- a/tree.h
+++ b/tree.h
@@ -12,7 +12,7 @@ struct tree {
        unsigned long size;
 };
 
-struct tree *lookup_tree(const struct object_id *oid);
+struct tree *lookup_tree(struct repository *r, const struct object_id *oid);
 
 int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size);