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

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>

diff --git a/builtin-archive.c b/builtin-archive.c
index 5ceec433fd590e8bf6a51700ea69c37f9af30fa7..432ce2acc6bb687b35f3e9663f3058ebef2354e7 100644 (file)
--- a/builtin-archive.c
+++ b/builtin-archive.c
@@ -111,6 +111,8 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
 {
        const char *remote = NULL;
 
+       git_config(git_default_config, NULL);
+
        remote = extract_remote_arg(&argc, argv);
        if (remote)
                return run_remote_archiver(remote, argc, argv);

diff --git a/t/t0024-crlf-archive.sh b/t/t0024-crlf-archive.sh
index 35114396c6543e0131462472056ff212eab8484e..e5330395fc866b2a913b4b20ecb66f1f2a3bbaff 100644 (file)
--- a/t/t0024-crlf-archive.sh
+++ b/t/t0024-crlf-archive.sh
@@ -33,7 +33,7 @@ if [ $? -eq 127 ]; then
        exit
 fi
 
-test_expect_failure 'zip archive' '
+test_expect_success 'zip archive' '
 
        git archive --format=zip HEAD >test.zip &&