X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=read-tree.c;h=e3b9c0d9fa1cb5a03d1a3a08f992074293285904;hb=e99fcf96deab45ca81b22948328deb2d8586aa8d;hp=6a456ae61100f8e45f97394d7ea23be4faa63fc4;hpb=29504118f8528f658fd0bfc02d8d78d4c01dc2cc;p=git.git diff --git a/read-tree.c b/read-tree.c index 6a456ae6..e3b9c0d9 100644 --- a/read-tree.c +++ b/read-tree.c @@ -629,10 +629,14 @@ int main(int argc, char **argv) unsigned char sha1[20]; merge_fn_t fn = NULL; + setup_git_directory(); + newfd = hold_index_file_for_update(&cache_file, get_index_file()); if (newfd < 0) die("unable to create new cachefile"); + git_config(git_default_config); + merge = 0; reset = 0; for (i = 1; i < argc; i++) {