mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/zip-compresssed-size-with-export-subst'

Browse Source 
When export-subst is used, "zip" output recorded incorrect
size of the file.

* rs/zip-compresssed-size-with-export-subst:
  archive-zip: fix compressed size for stored export-subst files
This commit is contained in:
Junio C Hamano
2013-03-21 14:03:04 -07:00
parent 95ef66df43 d3c1472fe3
commit e9bebbb67c
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
archive-zip.c
View File

@ -240,7 +240,6 @@ static int write_zip_entry(struct archiver_args *args,
(mode & 0111) ? ((mode) << 16) : 0; (mode & 0111) ? ((mode) << 16) : 0;
if (S_ISREG(mode) && args->compression_level != 0 && size > 0) if (S_ISREG(mode) && args->compression_level != 0 && size > 0)
method = 8; method = 8;
compressed_size = (method == 0) ? size : 0;
if (S_ISREG(mode) && type == OBJ_BLOB && !args->convert && if (S_ISREG(mode) && type == OBJ_BLOB && !args->convert &&
size > big_file_threshold) { size > big_file_threshold) {
@ -259,6 +258,7 @@ static int write_zip_entry(struct archiver_args *args,
crc = crc32(crc, buffer, size); crc = crc32(crc, buffer, size);
out = buffer; out = buffer;
} }
compressed_size = (method == 0) ? size : 0;
} else { } else {
return error("unsupported file mode: 0%o (SHA1: %s)", mode, return error("unsupported file mode: 0%o (SHA1: %s)", mode,
sha1_to_hex(sha1)); sha1_to_hex(sha1));

6
t/t5003-archive-zip.sh
View File

@ -76,6 +76,12 @@ test_expect_success \
git update-ref HEAD $(TZ=GMT GIT_COMMITTER_DATE="2005-05-27 22:00:00" \ git update-ref HEAD $(TZ=GMT GIT_COMMITTER_DATE="2005-05-27 22:00:00" \
git commit-tree $treeid </dev/null)' git commit-tree $treeid </dev/null)'
test_expect_success 'setup export-subst' '
echo "substfile?" export-subst >>.git/info/attributes &&
git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
>a/substfile1
'
test_expect_success \ test_expect_success \
'create bare clone' \ 'create bare clone' \
'git clone --bare . bare.git && 'git clone --bare . bare.git &&