summaryrefslogtreecommitdiff
path: root/diff-cache.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-04-26 17:13:31 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-26 17:13:31 (GMT)
commit5697ecc7be275f884d4f843d0f77f19de2eb604c (patch)
tree95e526ff58f1d006fceb56c0c0e003d511f79c30 /diff-cache.c
parentbe3cfa85f45e32722a65349d023667be906a66b6 (diff)
downloadgit-5697ecc7be275f884d4f843d0f77f19de2eb604c.zip
git-5697ecc7be275f884d4f843d0f77f19de2eb604c.tar.gz
git-5697ecc7be275f884d4f843d0f77f19de2eb604c.tar.bz2
[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>
Diffstat (limited to 'diff-cache.c')
-rw-r--r--diff-cache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-cache.c b/diff-cache.c
index 2ec6c29..c7fa84b 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]))