aboutsummaryrefslogtreecommitdiff
path: root/builtin-clone.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-25 14:25:02 -0700
committerJunio C Hamano <gitster@pobox.com>2008-05-25 14:25:02 -0700
commit9bd81e4249a419f9cde8fd68e033e263533f4914 (patch)
tree5a4c77cc648dc720e40c76e83a489ab40e70e187 /builtin-clone.c
parent450c5aed06ecf60084f993f688b549ffa377b64e (diff)
parentef90d6d4208a5130185b04f06e5f90a5f9959fe3 (diff)
downloadgit-9bd81e4249a419f9cde8fd68e033e263533f4914.tar.gz
git-9bd81e4249a419f9cde8fd68e033e263533f4914.tar.xz
Merge branch 'js/config-cb'v1.5.6-rc0
* js/config-cb: Provide git_config with a callback-data parameter Conflicts: builtin-add.c builtin-cat-file.c
Diffstat (limited to 'builtin-clone.c')
-rw-r--r--builtin-clone.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-clone.c b/builtin-clone.c
index 2a3f6732f..4740b1306 100644
--- a/builtin-clone.c
+++ b/builtin-clone.c
@@ -418,7 +418,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
if (option_reference)
setup_reference(git_dir);
- git_config(git_default_config);
+ git_config(git_default_config, NULL);
if (option_bare) {
strcpy(branch_top, "refs/heads/");