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

hashpling · gitster · commit b99b5b40cffb · 2008-09-18T19:49:28.000-07:00
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 &lt;charles@hashpling.org&gt;
Acked-by: René Scharfe &lt;rene.scharfe@lsrfire.ath.cx&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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 &&
 

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,8 @@ int cmd_archive(int argc, const char *argv, const char prefix)`
`111`	`111`	`{`
`112`	`112`	`const char *remote = NULL;`
`113`	`113`
	`114`	`+ git_config(git_default_config, NULL);`
	`115`	`+`
`114`	`116`	`remote = extract_remote_arg(&argc, argv);`
`115`	`117`	`if (remote)`
`116`	`118`	`return run_remote_archiver(remote, argc, argv);`