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 2/6] revision: factor out get_commit()
Date: Thu, 15 Sep 2022 16:52:04 +0200 [thread overview]
Message-ID: <90bdf408-9bad-6816-06c1-66ac64ea9c3b@web.de> (raw)
In-Reply-To: <ba6eea28-fb3a-b376-2529-351727c02f1a@web.de>
Split out the first half of add_parents_only() to obtain a function that
finds and returns the commit object. It allows checking the validity of
the child separately from adding its parents.
Signed-off-by: René Scharfe <l.s.r@web.de>
---
revision.c | 35 +++++++++++++++++++++++------------
1 file changed, 23 insertions(+), 12 deletions(-)
diff --git a/revision.c b/revision.c
index 0b8d48f94c..4f896b4992 100644
--- a/revision.c
+++ b/revision.c
@@ -1822,35 +1822,46 @@ static void add_alternate_refs_to_pending(struct rev_info *revs,
for_each_alternate_ref(add_one_alternate_ref, &data);
}
-static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
- int exclude_parent)
+static struct commit *get_commit(struct rev_info *revs, const char *arg_)
{
struct object_id oid;
struct object *it;
- struct commit *commit;
- struct commit_list *parents;
- int parent_number;
const char *arg = arg_;
- if (*arg == '^') {
- flags ^= UNINTERESTING | BOTTOM;
+ if (*arg == '^')
arg++;
- }
if (get_oid_committish(arg, &oid))
- return 0;
+ return NULL;
while (1) {
it = get_reference(revs, arg, &oid, 0);
if (!it && revs->ignore_missing)
- return 0;
+ return NULL;
if (it->type != OBJ_TAG)
break;
if (!((struct tag*)it)->tagged)
- return 0;
+ return NULL;
oidcpy(&oid, &((struct tag*)it)->tagged->oid);
}
if (it->type != OBJ_COMMIT)
+ return NULL;
+ return (struct commit *)it;
+}
+
+static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
+ int exclude_parent)
+{
+ 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++;
+ }
+ if (!commit)
return 0;
- commit = (struct commit *)it;
if (exclude_parent &&
exclude_parent > commit_list_count(commit->parents))
return 0;
--
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 ` René Scharfe [this message]
2022-09-15 14:52 ` [PATCH 3/6] revision: factor out add_parent() René Scharfe
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=90bdf408-9bad-6816-06c1-66ac64ea9c3b@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).