From 5697ecc7be275f884d4f843d0f77f19de2eb604c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 26 Apr 2005 10:13:31 -0700 Subject: [PATCH] [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 Signed-off-by: Linus Torvalds --- diff-cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diff-cache.c b/diff-cache.c index 2ec6c29ab..c7fa84bff 100644 --- 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])) -- 2.30.2