undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make git archive respect core.autocrlf when creating zip format archives

Browse Source 
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>
This commit is contained in:
Charles Bailey 2008-09-18 21:01:20 +01:00 committed by Junio C Hamano
parent f1265cc9ff
commit b99b5b40cf
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-archive.c
View File

@ -111,6 +111,8 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
{ {
const char *remote = NULL; const char *remote = NULL;
git_config(git_default_config, NULL);
remote = extract_remote_arg(&argc, argv); remote = extract_remote_arg(&argc, argv);
if (remote) if (remote)
return run_remote_archiver(remote, argc, argv); return run_remote_archiver(remote, argc, argv);

2
t/t0024-crlf-archive.sh
View File

@ -33,7 +33,7 @@ if [ $? -eq 127 ]; then
exit exit
fi fi
test_expect_failure 'zip archive' ' test_expect_success 'zip archive' '
git archive --format=zip HEAD >test.zip && git archive --format=zip HEAD >test.zip &&