[PATCH 3/6] revision: factor out add_parent()
- From
René Scharfe <l.s.r@web.de>
- Date
- Sep 15, 2022, 14:52 UTC
- Message-ID
- <b115f148-937b-5957-bfb7-930c02f446fb@web.de>
- In-Reply-To
- <ba6eea28-fb3a-b376-2529-351727c02f1a@web.de>
Split out the addition of a single parent into a helper. We'll use it in the next commit.
Signed-off-by: René Scharfe <l.s.r@web.de> --- revision.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/revision.c b/revision.c index 4f896b4992..14cb73e508 100644 --- a/revision.c +++ b/revision.c @@ -1847,19 +1847,27 @@ static struct commit *get_commit(struct rev_info *revs, const char *arg_) return (struct commit *)it; } -static int add_parents_only(struct rev_info *revs, const char *arg_, int flags, - int exclude_parent) +static void add_parent(struct rev_info *revs, struct object *parent, + const char *arg_, int flags) { - struct object *it; - struct commit *commit = get_commit(revs, arg_); - struct commit_list *parents; - int parent_number; const char *arg = arg_; if (*arg == '^') { flags ^= UNINTERESTING | BOTTOM; arg++; } + parent->flags |= flags; + add_rev_cmdline(revs, parent, arg_, REV_CMD_PARENTS_ONLY, flags); + add_pending_object(revs, parent, arg); +} + +static int add_parents_only(struct rev_info *revs, const char *arg_, int flags, + int exclude_parent) +{ + struct commit *commit = get_commit(revs, arg_); + struct commit_list *parents; + int parent_number; + if (!commit) return 0; if (exclude_parent && @@ -1871,10 +1879,7 @@ static int add_parents_only(struct rev_info *revs, const char *arg_, int flags, if (exclude_parent && parent_number != exclude_parent) continue; - it = &parents->item->object; - it->flags |= flags; - add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags); - add_pending_object(revs, it, arg); + add_parent(revs, &parents->item->object, arg_, flags); } return 1; } -- 2.37.3