Merge branch 'js/maint-1.6.1-rebase-i-submodule' into maint-1.6.1

diff --git a/archive.c b/archive.c
index 849eed553e9d6455c021664135a01b322eef9a31..9ac455d889b72deba8c949da1d9efe2be3a50244 100644 (file)
--- a/archive.c
+++ b/archive.c
@@ -336,5 +336,7 @@ int write_archive(int argc, const char **argv, const char *prefix,
        parse_treeish_arg(argv, &args, prefix);
        parse_pathspec_arg(argv + 1, &args);
 
+       git_config(git_default_config, NULL);
+
        return ar->write_archive(&args);
 }