X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=read-tree.c;h=e3b9c0d9fa1cb5a03d1a3a08f992074293285904;hb=53228a5fb8e80f87803e4a3ba8ed25b70fb4871d;hp=df156ea0dad15ee810e8036442dfcab9202ef46a;hpb=3eeb419968c1f8f0a762a7127db770e9d9c8037d;p=git.git diff --git a/read-tree.c b/read-tree.c index df156ea0..e3b9c0d9 100644 --- a/read-tree.c +++ b/read-tree.c @@ -629,6 +629,8 @@ 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");