diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-04-26 10:13:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-26 10:13:31 -0700 |
| commit | 5697ecc7be275f884d4f843d0f77f19de2eb604c (patch) | |
| tree | 95e526ff58f1d006fceb56c0c0e003d511f79c30 /diff-cache.c | |
| parent | be3cfa85f45e32722a65349d023667be906a66b6 (diff) | |
| download | git-5697ecc7be275f884d4f843d0f77f19de2eb604c.tar.gz | |
[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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-cache.c b/diff-cache.c index 2ec6c29ab6..c7fa84bffb 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])) |