зеркало из https://github.com/microsoft/git.git
Merge branch 'rs/zip-with-uncompressed-size-in-the-header' into maint
"git archive" did not record uncompressed size in the header when streaming a zip archive, which confused some implementations of unzip. * rs/zip-with-uncompressed-size-in-the-header: archive-zip: write uncompressed size into header even with streaming
This commit is contained in:
Коммит
ca7ccd5f46
|
@ -240,7 +240,7 @@ static int write_zip_entry(struct archiver_args *args,
|
|||
(mode & 0111) ? ((mode) << 16) : 0;
|
||||
if (S_ISREG(mode) && args->compression_level != 0 && size > 0)
|
||||
method = 8;
|
||||
compressed_size = size;
|
||||
compressed_size = (method == 0) ? size : 0;
|
||||
|
||||
if (S_ISREG(mode) && type == OBJ_BLOB && !args->convert &&
|
||||
size > big_file_threshold) {
|
||||
|
@ -313,10 +313,7 @@ static int write_zip_entry(struct archiver_args *args,
|
|||
copy_le16(header.compression_method, method);
|
||||
copy_le16(header.mtime, zip_time);
|
||||
copy_le16(header.mdate, zip_date);
|
||||
if (flags & ZIP_STREAM)
|
||||
set_zip_header_data_desc(&header, 0, 0, 0);
|
||||
else
|
||||
set_zip_header_data_desc(&header, size, compressed_size, crc);
|
||||
set_zip_header_data_desc(&header, size, compressed_size, crc);
|
||||
copy_le16(header.filename_length, pathlen);
|
||||
copy_le16(header.extra_length, ZIP_EXTRA_MTIME_SIZE);
|
||||
write_or_die(1, &header, ZIP_LOCAL_HEADER_SIZE);
|
||||
|
|
Загрузка…
Ссылка в новой задаче