Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > I only found this: > > http://thread.gmane.org/gmane.comp.version-control.git/29222 Thanks. As it happens, the patch I just sent out is a moral equivalent of your patch in that thread ;-) We still may need to think about being careful upon --full-history though. Second try, this time not doing the simplification when --full-history is given. -- >8 -- [PATCH] remove duplicated parents after history simplification When we simplify history due to path limits, the parents list for a rewritten commit can end up having duplicates. Instead of filtering them out in the output codepath like earlier commit 88494423 did, remove them much earlier, when the parent information actually gets rewritten. Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> --- revision.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/revision.c b/revision.c index 5184716..740e6a8 100644 --- a/revision.c +++ b/revision.c @@ -1308,6 +1308,25 @@ static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp } } +static void remove_duplicate_parents(struct commit *commit) +{ + struct commit_list *p; + struct commit_list **pp = &commit->parents; + + /* Examine existing parents while marking ones we have seen... */ + for (p = commit->parents; p; p = p->next) { + struct commit *parent = p->item; + if (parent->object.flags & TMP_MARK) + continue; + parent->object.flags |= TMP_MARK; + *pp = p; + pp = &p->next; + } + /* ... and clear the temporary mark */ + for (p = commit->parents; p; p = p->next) + p->item->object.flags &= ~TMP_MARK; +} + static int rewrite_parents(struct rev_info *revs, struct commit *commit) { struct commit_list **pp = &commit->parents; @@ -1324,6 +1343,8 @@ static int rewrite_parents(struct rev_info *revs, struct commit *commit) } pp = &parent->next; } + if (revs->simplify_history) + remove_duplicate_parents(commit); return 0; } - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
