summaryrefslogtreecommitdiff
path: root/archive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-10-26 16:21:08 -0700
committerJunio C Hamano <gitster@pobox.com>2008-10-26 16:21:08 -0700
commit304d058370a9a797c38ec739c6d39fa45d9ed8e5 (patch)
tree36488ea65db3ef57e6be9cb87c89283362fbc878 /archive.c
parentb8492539f9c078162ee3ae4987ceaa7e7f510c9b (diff)
parent9fe7a643fcc56ca1c17afec5d5f8adca10cabdd1 (diff)
downloadgit-304d058370a9a797c38ec739c6d39fa45d9ed8e5.tar.gz
Merge branch 'maint'
* maint: add -p: warn if only binary changes present git-archive: work in bare repos git-svn: change dashed git-config to git config
Diffstat (limited to 'archive.c')
-rw-r--r--archive.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/archive.c b/archive.c
index 849eed553e..9ac455d889 100644
--- 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);
}