[PATCH] diff-cache buglet

diff-cache attempts to first remove all merge entries before letting the
diff_cache() do its work, but it incorrectly stops after the first
merge-entry it finds.

Fix by just replacing the "break" with a "continue".

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/diff-cache.c b/diff-cache.c
index 2ec6c29ab6b79a10277a2ff9021a2032d656abf0..c7fa84bffb07504890259fca1b05bd499847e1fe 100644 (file)
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -76,7 +76,7 @@ static void remove_merge_entries(void)
        for (i = 0; i < active_nr; i++) {
                struct cache_entry *ce = active_cache[i];
                if (!ce_stage(ce))
-                       break;
+                       continue;
                printf("%s: unmerged\n", ce->name);
                while (remove_entry_at(i)) {
                        if (!ce_stage(active_cache[i]))