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]
/
write-tree.c
diff --git
a/write-tree.c
b/write-tree.c
index
2b2c6b7
..
0aac32f
100644
(file)
--- a/
write-tree.c
+++ b/
write-tree.c
@@
-86,9
+86,12
@@
static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
int main(int argc, char **argv)
{
int i, funny;
- int entries
= read_cache()
;
+ int entries;
unsigned char sha1[20];
+ setup_git_directory();
+
+ entries = read_cache();
if (argc == 2) {
if (!strcmp(argv[1], "--missing-ok"))
missing_ok = 1;