X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=read-tree.c;h=eaff4441963409ea058722ef08fcf181a34a0c96;hb=84a9b58c421f9b2d1cc6c195ed441fac48e60392;hp=1c3b09beffdf347af40b385f632d481c99645a33;hpb=c51d13692d4e451c755dd7da3521c5db395df192;p=git.git diff --git a/read-tree.c b/read-tree.c index 1c3b09be..eaff4441 100644 --- a/read-tree.c +++ b/read-tree.c @@ -717,6 +717,7 @@ int main(int argc, char **argv) merge_fn_t fn = NULL; setup_git_directory(); + git_config(git_default_config); newfd = hold_index_file_for_update(&cache_file, get_index_file()); if (newfd < 0)