From: Charles Bailey Date: Sun, 21 Sep 2008 20:25:27 GMT Subject: [PATCH 2/2] Make git respect core.autocrlf for zip archives Message-ID: <1222028727-30097-2-git-send-email-charles@hashpling.org> In-Reply-To: <1222028727-30097-1-git-send-email-charles@hashpling.org> 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 --- builtin-archive.c | 2 ++ t/t0024-crlf-archive.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/builtin-archive.c b/builtin-archive.c index 5ceec43..432ce2a 100644 --- 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 3511439..e533039 100644 --- 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 && -- 1.6.0.1.309.g4f56