diff --git a/read-tree.c b/read-tree.c
index 0d94fe214d4fd7b24b00f419097f79dab4889670..65f2d9a5dc5dd6cf6aaa24ca90d96c5c7ab6992d 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
buffer = read_object_with_reference(sha1, "tree", &size, NULL);
if (!buffer)
return -1;
- ret = read_tree(buffer, size, stage);
+ ret = read_tree(buffer, size, stage, NULL);
free(buffer);
return ret;
}
merge = 1;
stage = 1;
read_cache_unmerged();
+ continue;
}
/* "-m" stands for "merge", meaning we start in stage 1 */