diff options
| author | Jon Seymour <jon.seymour@gmail.com> | 2005-06-20 12:29:33 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-19 20:13:18 -0700 |
| commit | c3c1163137b0b1bbe1edf9da0421832e452c7a10 (patch) | |
| tree | 74cf22c1181816862fd8c57892ae13d8578eaaf9 /epoch.c | |
| parent | d6bd56a0e2d710d17c9dc61cfc7fea1b8e3f4629 (diff) | |
| download | git-c3c1163137b0b1bbe1edf9da0421832e452c7a10.tar.gz | |
[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>
Diffstat (limited to 'epoch.c')
| -rw-r--r-- | epoch.c | 16 |
1 files changed, 6 insertions, 10 deletions
@@ -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) { |