Merge branch 'jk/merge-subtree-heuristics'

diff --git a/negotiator/default.c b/negotiator/default.c
index 382fc77722a396778c308c7ecbee780dd3b79588..4b78f6bf36a0479a55934a6e4ac4c288775217f5 100644 (file)
--- a/negotiator/default.c
+++ b/negotiator/default.c
@@ -38,7 +38,7 @@ static void rev_list_push(struct negotiation_state *ns,
 static int clear_marks(const char *refname, const struct object_id *oid,
                       int flag, void *cb_data)
 {
-       struct object *o = deref_tag(parse_object(oid), refname, 0);
+       struct object *o = deref_tag(the_repository, parse_object(the_repository, oid), refname, 0);
 
        if (o && o->type == OBJ_COMMIT)
                clear_commit_marks((struct commit *)o,