git-archive --format=zip: use default version ID

Use 10 for the "version needed to extract" field.  This is the
default value, and we want to use it because we don't do anything
special.  Info-ZIP's zip uses it, too.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/archive-zip.c b/archive-zip.c
index 3ffdad68d130136312028b389da73af1a789232e..ae7462353da7b0f5afd3659aa3dac26cd61c80b7 100644 (file)
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -214,7 +214,7 @@ static int write_zip_entry(const unsigned char *sha1,
 
        copy_le32(dirent.magic, 0x02014b50);
        copy_le16(dirent.creator_version, 0);
 
        copy_le32(dirent.magic, 0x02014b50);
        copy_le16(dirent.creator_version, 0);

-       copy_le16(dirent.version, 20);
+       copy_le16(dirent.version, 10);

        copy_le16(dirent.flags, 0);
        copy_le16(dirent.compression_method, method);
        copy_le16(dirent.mtime, zip_time);
        copy_le16(dirent.flags, 0);
        copy_le16(dirent.compression_method, method);
        copy_le16(dirent.mtime, zip_time);


@@ -236,7 +236,7 @@ static int write_zip_entry(const unsigned char *sha1,
        zip_dir_entries++;
 
        copy_le32(header.magic, 0x04034b50);
        zip_dir_entries++;
 
        copy_le32(header.magic, 0x04034b50);

-       copy_le16(header.version, 20);
+       copy_le16(header.version, 10);

        copy_le16(header.flags, 0);
        copy_le16(header.compression_method, method);
        copy_le16(header.mtime, zip_time);
        copy_le16(header.flags, 0);
        copy_le16(header.compression_method, method);
        copy_le16(header.mtime, zip_time);