b99b5b40cf
There is currently no call to git_config at the start of cmd_archive. When creating tar archives the core config is read as a side-effect of reading the tar specific config, but this doesn't happen for zip archives. The consequence is that in a configuration with core.autocrlf set, although files in a tar archive are created with crlf line endings, files in a zip archive retain unix line endings. Signed-off-by: Charles Bailey <charles@hashpling.org> Acked-by: René Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
47 lines
754 B
Bash
47 lines
754 B
Bash
#!/bin/sh
|
|
|
|
test_description='respect crlf in git archive'
|
|
|
|
. ./test-lib.sh
|
|
UNZIP=${UNZIP:-unzip}
|
|
|
|
test_expect_success setup '
|
|
|
|
git config core.autocrlf true
|
|
|
|
printf "CRLF line ending\r\nAnd another\r\n" > sample &&
|
|
git add sample &&
|
|
|
|
test_tick &&
|
|
git commit -m Initial
|
|
|
|
'
|
|
|
|
test_expect_success 'tar archive' '
|
|
|
|
git archive --format=tar HEAD |
|
|
( mkdir untarred && cd untarred && "$TAR" -xf - )
|
|
|
|
test_cmp sample untarred/sample
|
|
|
|
'
|
|
|
|
"$UNZIP" -v >/dev/null 2>&1
|
|
if [ $? -eq 127 ]; then
|
|
echo "Skipping ZIP test, because unzip was not found"
|
|
test_done
|
|
exit
|
|
fi
|
|
|
|
test_expect_success 'zip archive' '
|
|
|
|
git archive --format=zip HEAD >test.zip &&
|
|
|
|
( mkdir unzipped && cd unzipped && unzip ../test.zip ) &&
|
|
|
|
test_cmp sample unzipped/sample
|
|
|
|
'
|
|
|
|
test_done
|