Merge branch 'cf/submodule-progress-dissociate'

diff --git a/archive-zip.c b/archive-zip.c
index 6b20bce4d1cd78563037c8658dd8bd8f7690c47b..74f3fe9103420571c9f22273ae44ebb9d5715c78 100644 (file)
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -325,7 +325,8 @@ 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(oid, &size);
+               enum object_type type = oid_object_info(the_repository, oid,
+                                                       &size);
 
                method = 0;
                attr2 = S_ISLNK(mode) ? ((mode | 0777) << 16) :