[PATCH] revision.c: really honor --first-parent
- From
- Lars Hjemli <hjemli@gmail.com>
- Date
- May 11, 2008, 23:14 UTC
- Message-ID
- <1210547651-32510-1-git-send-email-hjemli@gmail.com>
- In-Reply-To
- <7vd4ns3cll.fsf@gitster.siamese.dyndns.org>
In add_parents_to_list, if any parent of a revision had already been SEEN, the current code would continue with the next parent. But if the first parent has been SEEN and --first-parent has been specified we need to break, not continue.
Signed-off-by: Lars Hjemli <hjemli@gmail.com> --- revision.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/revision.c b/revision.c index 44d780b..974ad10 100644 --- a/revision.c +++ b/revision.c @@ -468,8 +468,11 @@ static int add_parents_to_list(struct rev_info *revs, struct commit *commit, str if (parse_commit(p) < 0) return -1; p->object.flags |= left_flag; - if (p->object.flags & SEEN) + if (p->object.flags & SEEN) { + if (revs->first_parent_only) + break; continue; + } p->object.flags |= SEEN; insert_by_date(p, list); if(revs->first_parent_only)
-- 1.5.5.1.148.g8ee22.dirty