undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] diff-cache buglet

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2005-04-26 10:13:31 -07:00 committed by Linus Torvalds
parent be3cfa85f4
commit 5697ecc7be
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diff-cache.c
View File

@ -76,7 +76,7 @@ static void remove_merge_entries(void)
for (i = 0; i < active_nr; i++) { for (i = 0; i < active_nr; i++) {
struct cache_entry *ce = active_cache[i]; struct cache_entry *ce = active_cache[i];
if (!ce_stage(ce)) if (!ce_stage(ce))
break; continue;
printf("%s: unmerged\n", ce->name); printf("%s: unmerged\n", ce->name);
while (remove_entry_at(i)) { while (remove_entry_at(i)) {
if (!ce_stage(active_cache[i])) if (!ce_stage(active_cache[i]))