From: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Date: Fri, 6 Oct 2006 23:47:24 +0000 (+0200)
Subject: git-archive --format=zip: use default version ID
X-Git-Tag: v1.4.4-rc1~94^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf72fb07b77c73b4777b6a2e0836e3029c5f0f3c;p=thirdparty%2Fgit.git

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 3ffdad68d1..ae7462353d 100644
--- 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_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);
@@ -236,7 +236,7 @@ static int write_zip_entry(const unsigned char *sha1,
 	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);