> @@ -1413,10 +1414,10 @@ void *read_object_file_extended(const struct object_id *oid, > const char *path; > struct stat st; > const struct object_id *repl = lookup_replace ? > - lookup_replace_object(the_repository, oid) : oid; > + lookup_replace_object(r, oid) : oid; Firstly, patches 1 and 2 are obviously correct. This lookup_replace_object() is a bit tricky in that at 'master', register_replace_ref() (indirectly called by lookup_replace_object()) did not handle arbitrary repositories correctly, but 'next' has a patch that solves this, so this shouldn't be an issue. The other function changes look fine. So this patch looks correct too.