From: Jon Seymour Date: Mon, 20 Jun 2005 02:29:33 +0000 (+1000) Subject: [PATCH] Relaxes error checking in epoch.c to allow duplicate parents X-Git-Tag: v0.99~237 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c3c1163137b0b1bbe1edf9da0421832e452c7a10;p=git.git [PATCH] Relaxes error checking in epoch.c to allow duplicate parents Given that real trees in the wild include parents with duplicate parents, I have relaxed over-zealous error checking in epoch.c and dealt with the problem a different way - duplicate parents are now silently ignored. Signed-off-by: Jon Seymour Signed-off-by: Linus Torvalds --- diff --git a/epoch.c b/epoch.c index 82becf677..fdfaddafb 100644 --- a/epoch.c +++ b/epoch.c @@ -224,17 +224,13 @@ static int find_base_for_list(struct commit_list *list, struct commit **boundary for (; list; list = list->next) { struct commit *item = list->item; - if (item->object.util) { - die("%s:%d:%s: logic error: this should not have happened - commit %s", - __FILE__, __LINE__, __FUNCTION__, - sha1_to_hex(item->object.sha1)); - } - - new_mass_counter(list->item, get_one()); - add(&injected, &injected, get_one()); + if (!item->object.util) { + new_mass_counter(list->item, get_one()); + add(&injected, &injected, get_one()); - commit_list_insert(list->item, &cleaner); - commit_list_insert(list->item, &pending); + commit_list_insert(list->item, &cleaner); + commit_list_insert(list->item, &pending); + } } while (!*boundary && pending && !ret) {