summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--builtin-archive.c2
-rw-r--r--t/t0024-crlf-archive.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/builtin-archive.c b/builtin-archive.c
index 5ceec433fd..432ce2acc6 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 35114396c6..e5330395fc 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 &&