X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=read-tree.c;h=ce2bb88f0aae8919f188a0dbc5f3338523151740;hb=52be5fcd29e074cb549b9a92ff8caceb736e4851;hp=0d94fe214d4fd7b24b00f419097f79dab4889670;hpb=036d51cc557bcf919246ad30cb2ac7736bfc836b;p=git.git

diff --git a/read-tree.c b/read-tree.c
index 0d94fe21..ce2bb88f 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -17,7 +17,7 @@ static int unpack_tree(unsigned char *sha1)
 	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;
 }
@@ -510,7 +510,7 @@ static int read_cache_unmerged(void)
 	return deleted;
 }
 
-static char *read_tree_usage = "git-read-tree (<sha> | -m [-u] <sha1> [<sha2> [<sha3>]])";
+static const char read_tree_usage[] = "git-read-tree (<sha> | -m [-u] <sha1> [<sha2> [<sha3>]])";
 
 static struct cache_file cache_file;
 
@@ -543,6 +543,7 @@ int main(int argc, char **argv)
 			merge = 1;
 			stage = 1;
 			read_cache_unmerged();
+			continue;
 		}
 
 		/* "-m" stands for "merge", meaning we start in stage 1 */