git-read-tree: fix "--reset" handling

7875b50d · Linus Torvalds · ce30a4b6 · 7875b50d
隐藏空白更改
内联并排

Showing with 1 addition and 0 deletion

read-tree.c read-tree.c +1 -0

未找到文件。
--- a/read-tree.c
+++ b/read-tree.c
@@ -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 */