From: "René Scharfe" <l.s.r@web.de>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Tim Jaacks <tim.jaacks@garz-fricke.com>,
Chris Torek <chris.torek@gmail.com>
Subject: [PATCH 3/6] revision: factor out add_parent()
Date: Thu, 15 Sep 2022 16:52:54 +0200 [thread overview]
Message-ID: <b115f148-937b-5957-bfb7-930c02f446fb@web.de> (raw)
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
next prev parent reply other threads:[~2022-09-15 14:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-15 14:48 [PATCH 0/6] revision: fix order of revs for ^! René Scharfe
2022-09-15 14:51 ` [PATCH 1/6] revision: use strtol_i() for exclude_parent René Scharfe
2022-09-17 0:59 ` Chris Torek
2022-09-15 14:52 ` [PATCH 2/6] revision: factor out get_commit() René Scharfe
2022-09-15 14:52 ` René Scharfe [this message]
2022-09-15 14:53 ` [PATCH 4/6] revision: factor out add_parents() René Scharfe
2022-09-15 14:54 ` [PATCH 5/6] revision: rename add_parents_only() to add_nth_parent() René Scharfe
2022-09-15 14:55 ` [PATCH 6/6] revision: add parents after child for ^! René Scharfe
2022-09-15 17:53 ` Junio C Hamano
2022-09-16 9:02 ` René Scharfe
2022-09-16 15:55 ` Junio C Hamano
2022-09-18 5:36 ` René Scharfe
2022-10-01 10:23 ` [PATCH v3 0/3] diff: support ^! for merges René Scharfe
2022-10-01 10:25 ` [PATCH v3 1/3] revision: use strtol_i() for exclude_parent René Scharfe
2022-10-01 10:26 ` [PATCH v3 2/3] revisions.txt: unspecify order of resolved parts of ^! René Scharfe
2022-10-01 10:28 ` [PATCH v3 3/3] diff: support ^! for merges René Scharfe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b115f148-937b-5957-bfb7-930c02f446fb@web.de \
--to=l.s.r@web.de \
--cc=chris.torek@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tim.jaacks@garz-fricke.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).