[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 <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/epoch.c b/epoch.c
index 82becf677ba852cf103a9f9a1131dc54141f019f..fdfaddafbcba305caa0ed092b16c7e960fd45b36 100644 (file)
--- 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;
 
        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) {
        }
 
        while (!*boundary && pending && !ret) {