diff options
Diffstat (limited to 'rev-list.c')
| -rw-r--r-- | rev-list.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/rev-list.c b/rev-list.c index fdb531caf6..46a35d30e1 100644 --- a/rev-list.c +++ b/rev-list.c @@ -241,8 +241,9 @@ static void mark_parents_uninteresting(struct commit *commit) } } -static int everybody_uninteresting(struct commit_list *list) +static int everybody_uninteresting(struct commit_list *orig) { + struct commit_list *list = orig; while (list) { struct commit *commit = list->item; list = list->next; @@ -250,6 +251,29 @@ static int everybody_uninteresting(struct commit_list *list) continue; return 0; } + + /* + * Ok, go back and mark all the edge trees uninteresting, + * since otherwise we can have situations where a parent + * that was marked uninteresting (and we never even had + * to look at) had lots of objects that we don't want to + * include. + * + * NOTE! This still doesn't mean that the object list is + * "correct", since we may end up listing objects that + * even older commits (that we don't list) do actually + * reference, but it gets us to a minimal list (or very + * close) in practice. + */ + if (!tree_objects) + return 1; + + while (orig) { + struct commit *commit = orig->item; + if (!parse_commit(commit) && commit->tree) + mark_tree_uninteresting(commit->tree); + orig = orig->next; + } return 1; } |