From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 15 Jun 2005 17:25:46 +0000 (-0700)
Subject: git-read-tree: fix "--reset" handling
X-Git-Tag: v0.99~260
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7875b50d1a9928e683299b283bfe94778b6c344e;p=git.git

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

diff --git a/read-tree.c b/read-tree.c
index 0d94fe214..0d5ded502 100644
--- 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 */