summaryrefslogtreecommitdiff
path: root/builtin-init-db.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-init-db.c
parent450c5aed06ecf60084f993f688b549ffa377b64e (diff)
parentef90d6d4208a5130185b04f06e5f90a5f9959fe3 (diff)
downloadgit-9bd81e4249a419f9cde8fd68e033e263533f4914.tar.gz
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-init-db.c')
-rw-r--r--builtin-init-db.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-init-db.c b/builtin-init-db.c
index 3968c9911f..d8bdf928b1 100644
--- a/builtin-init-db.c
+++ b/builtin-init-db.c
@@ -144,7 +144,7 @@ static void copy_templates(const char *template_dir)
strcpy(template_path + template_len, "config");
repository_format_version = 0;
git_config_from_file(check_repository_format_version,
- template_path);
+ template_path, NULL);
template_path[template_len] = 0;
if (repository_format_version &&
@@ -198,7 +198,7 @@ static int create_default_files(const char *template_path)
*/
copy_templates(template_path);
- git_config(git_default_config);
+ git_config(git_default_config, NULL);
/*
* We would have created the above under user's umask -- under