summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-03-26 12:43:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-26 12:43:49 -0700
commit7d2726c3933538e5f256846a2bb38e1065c868b5 (patch)
treec1e2be1bc8c7cfb4c464637c7dc5f5e8986eb9e5 /t
parentMerge branch 'jk/utf-8-can-be-spelled-differently' into maint (diff)
parentarchive-zip: fix compressed size for stored export-subst files (diff)
downloadtgif-7d2726c3933538e5f256846a2bb38e1065c868b5.tar.xz
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-xt/t5003-archive-zip.sh6
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 &&