merge-recursive: remove final remaining caller of merge_file_one()

diff --git a/archive-zip.c b/archive-zip.c
index 024267ff0f771a73d4e80dec32934a8e5b8455f5..5a62351ab1a46f6a0827a7d41e794c00a4839edc 100644 (file)
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -326,7 +326,7 @@ static int write_zip_entry(struct archiver_args *args,
                compressed_size = 0;
                buffer = NULL;
        } else if (S_ISREG(mode) || S_ISLNK(mode)) {
-               enum object_type type = oid_object_info(the_repository, oid,
+               enum object_type type = oid_object_info(args->repo, oid,
                                                        &size);
 
                method = 0;