diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-26 23:43:49 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-26 23:43:49 +0400 |
| commit | 7d2726c3933538e5f256846a2bb38e1065c868b5 (patch) | |
| tree | c1e2be1bc8c7cfb4c464637c7dc5f5e8986eb9e5 /t | |
| parent | d7cccbb3bb706b6a9eb13120e354a8487b4b3cfe (diff) | |
| parent | d3c1472fe35e2575508d80415565822ee2211df5 (diff) | |
Merge branch 'rs/zip-compresssed-size-with-export-subst' into maint
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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5003-archive-zip.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh index 7cfe9ca3da..6a33606d28 100755 --- a/t/t5003-archive-zip.sh +++ b/t/t5003-archive-zip.sh @@ -76,6 +76,12 @@ test_expect_success \ git update-ref HEAD $(TZ=GMT GIT_COMMITTER_DATE="2005-05-27 22:00:00" \ 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 \ 'create bare clone' \ 'git clone --bare . bare.git && |