commit-graph: add repo arg to graph readers
[gitweb.git] / merge-recursive.c
index fbb044e6f6fd1b575622d37c1e15580ac95604d6..1dd6ec384de132d24f96b2ee89639bb765de9589 100644 (file)
@@ -1192,9 +1192,9 @@ static int merge_submodule(struct merge_options *o,
                return 0;
        }
 
-       if (!(commit_base = lookup_commit_reference(base)) ||
-           !(commit_a = lookup_commit_reference(a)) ||
-           !(commit_b = lookup_commit_reference(b))) {
+       if (!(commit_base = lookup_commit_reference(the_repository, base)) ||
+           !(commit_a = lookup_commit_reference(the_repository, a)) ||
+           !(commit_b = lookup_commit_reference(the_repository, b))) {
                output(o, 1, _("Failed to merge submodule %s (commits not present)"), path);
                return 0;
        }
@@ -3467,7 +3467,8 @@ static struct commit *get_ref(const struct object_id *oid, const char *name)
 {
        struct object *object;
 
-       object = deref_tag(parse_object(the_repository, oid), name,
+       object = deref_tag(the_repository, parse_object(the_repository, oid),
+                          name,
                           strlen(name));
        if (!object)
                return NULL;