tree: convert read_tree_recursive to struct object_id

diff --git a/merge-recursive.c b/merge-recursive.c
index 6ff971f9a2a8e251b8762d75214697698e2d1ce6..c886f2e9cd41d102a345a4a8392a4c9cd765db14 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -335,7 +335,7 @@ struct tree *write_tree_from_memory(struct merge_options *o)
        return result;
 }
 
-static int save_files_dirs(const unsigned char *sha1,
+static int save_files_dirs(const struct object_id *oid,
                struct strbuf *base, const char *path,
                unsigned int mode, int stage, void *context)
 {