[PATCH v2] revision.c: really honor --first-parent
- From
- Lars Hjemli <hjemli@gmail.com>
- Date
- May 12, 2008, 15:12 UTC
- Message-ID
- <1210605156-22926-1-git-send-email-hjemli@gmail.com>
- In-Reply-To
- <1210547651-32510-1-git-send-email-hjemli@gmail.com>
In add_parents_to_list, if any parent of a revision had already been SEEN, the current code would continue with the next parent, skipping the test for --first-parent. This patch inverts the test for SEEN so that the test for --first-parent is always performed.
Signed-off-by: Lars Hjemli <hjemli@gmail.com> --- This is a slightly different approach which I think is less ugly.
revision.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/revision.c b/revision.c index 44d780b..2fc26b8 100644 --- a/revision.c +++ b/revision.c @@ -468,10 +468,10 @@ 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) - continue; - p->object.flags |= SEEN; - insert_by_date(p, list); + if (!(p->object.flags & SEEN)) { + p->object.flags |= SEEN; + insert_by_date(p, list); + } if(revs->first_parent_only) break; }
-- 1.5.5.1.148.g8ee22.dirty