Merge branch 'tg/t5551-with-curl-7.61.1' into maint

diff --git a/archive-zip.c b/archive-zip.c
index 7ad46d8854d2d3d8c9681ff4933b348616b8f774..5a62351ab1a46f6a0827a7d41e794c00a4839edc 100644 (file)
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -6,6 +6,7 @@
 #include "archive.h"
 #include "streaming.h"
 #include "utf8.h"
+#include "object-store.h"
 #include "userdiff.h"
 #include "xdiff-interface.h"
 
@@ -325,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;