projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
git-merge: Exit with code 2 if no strategy was able to handle the merge.
[git.git]
/
read-tree.c
diff --git
a/read-tree.c
b/read-tree.c
index
df156ea
..
e3b9c0d
100644
(file)
--- 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");