object: add repository argument to object_as_type

diff --git a/merge-recursive.c b/merge-recursive.c
index bed4a5be02404ef512ba5cfcd9bb33ac04a4ca47..63bc0e2a04243c7e10701609fa49f80cc0124456 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -8,6 +8,8 @@
 #include "advice.h"
 #include "lockfile.h"
 #include "cache-tree.h"
+#include "object-store.h"
+#include "repository.h"
 #include "commit.h"
 #include "blob.h"
 #include "builtin.h"
@@ -3465,7 +3467,8 @@ static struct commit *get_ref(const struct object_id *oid, const char *name)
 {
        struct object *object;
 
-       object = deref_tag(parse_object(oid), name, strlen(name));
+       object = deref_tag(parse_object(the_repository, oid), name,
+                          strlen(name));
        if (!object)
                return NULL;
        if (object->type == OBJ_TREE)