@matheusbsbs / matheus-bagliano / commits / b99b5b40cf
Fork 0

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>

Charles Bailey committed Sep 18, 2008 at 21:01 UTC b99b5b40cffb5269e4aa38b6b60391b55039e27d
2 files changed +3 -1
builtin-archive.c
+2
@@ -111,6 +111,8 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
111 {
112 const char *remote = NULL;
113
114 + git_config(git_default_config, NULL);
115 +
116 remote = extract_remote_arg(&argc, argv);
117 if (remote)
118 return run_remote_archiver(remote, argc, argv);
t/t0024-crlf-archive.sh
+1 -1
@@ -33,7 +33,7 @@ if [ $? -eq 127 ]; then
33 exit
34 fi
35
36 -test_expect_failure 'zip archive' '
36 +test_expect_success 'zip archive' '
37
38 git archive --format=zip HEAD >test.zip &&
39