submodule loading: separate code path for .gitmodules and config overlay

diff --git a/archive-zip.c b/archive-zip.c
index 44ed78f163e38449862663bf89153945e274a6c5..27563e9e2602108997033e6fa79c660bc08aa863 100644 (file)
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -298,6 +298,7 @@ static int write_zip_entry(struct archiver_args *args,
        int is_binary = -1;
        const char *path_without_prefix = path + args->baselen;
        unsigned int creator_version = 0;
+       unsigned int version_needed = 10;
        size_t zip_dir_extra_size = ZIP_EXTRA_MTIME_SIZE;
        size_t zip64_dir_extra_payload_size = 0;
 
@@ -382,8 +383,11 @@ static int write_zip_entry(struct archiver_args *args,
        if (stream && size > 0x7fffffff)
                need_zip64_extra = 1;
 
+       if (need_zip64_extra)
+               version_needed = 45;
+
        copy_le32(header.magic, 0x04034b50);
-       copy_le16(header.version, 10);
+       copy_le16(header.version, version_needed);
        copy_le16(header.flags, flags);
        copy_le16(header.compression_method, method);
        copy_le16(header.mtime, zip_time);
@@ -509,7 +513,7 @@ static int write_zip_entry(struct archiver_args *args,
 
        strbuf_add_le(&zip_dir, 4, 0x02014b50); /* magic */
        strbuf_add_le(&zip_dir, 2, creator_version);
-       strbuf_add_le(&zip_dir, 2, 10);         /* version */
+       strbuf_add_le(&zip_dir, 2, version_needed);
        strbuf_add_le(&zip_dir, 2, flags);
        strbuf_add_le(&zip_dir, 2, method);
        strbuf_add_le(&zip_dir, 2, zip_time);
@@ -589,9 +593,17 @@ static void write_zip_trailer(const unsigned char *sha1)
                write_or_die(1, sha1_to_hex(sha1), GIT_SHA1_HEXSZ);
 }
 
-static void dos_time(time_t *time, int *dos_date, int *dos_time)
+static void dos_time(timestamp_t *timestamp, int *dos_date, int *dos_time)
 {
-       struct tm *t = localtime(time);
+       time_t time;
+       struct tm *t;
+
+       if (date_overflows(*timestamp))
+               die("timestamp too large for this system: %"PRItime,
+                   *timestamp);
+       time = (time_t)*timestamp;
+       t = localtime(&time);
+       *timestamp = time;
 
        *dos_date = t->tm_mday + (t->tm_mon + 1) * 32 +
                    (t->tm_year + 1900 - 1980) * 512;