From: Jonathan Tan <jonathantanmy@google.com>
To: gitster@pobox.com
Cc: jonathantanmy@google.com, git@vger.kernel.org, matvore@google.com
Subject: Re: [PATCH] revision: allow missing promisor objects on CLI
Date: Mon, 30 Dec 2019 10:38:01 -0800 [thread overview]
Message-ID: <20191230183801.28538-1-jonathantanmy@google.com> (raw)
In-Reply-To: <xmqqlfqxhzvu.fsf@gitster-ct.c.googlers.com>
> Jonathan Tan <jonathantanmy@google.com> writes:
>
> > object = get_reference(revs, arg, &oid, flags ^ local_flags);
> > if (!object)
> > - return revs->ignore_missing ? 0 : -1;
> > + /*
> > + * Either this object is missing and ignore_missing is true, or
> > + * this object is a (missing) promisor object and
> > + * exclude_promisor_objects is true.
>
> I had to guess and dig where these assertions are coming from; we
> should not force future readers of the code to.
>
> At least this comment must say why these assertions hold. Say
> something like "get_reference() yields NULL on only such and such
> cases" before concluding with "and in any of these cases, we can
> safely ignore it because ...".
OK, will do.
> I think the two cases the comment covers are safe for this caller to
> silently return 0. Another case get_reference() yields NULL is when
> oid_object_info() says it is a commit but it turns out that the
> object is found by repo_parse_commit() to be a non-commit, isn't it?
> I am not sure if it is safe for this caller to just return 0. There
> may be some other "unusual-but-not-fatal" cases where get_reference()
> does not hit a die() but returns NULL.
I don't think there is any other case where get_reference() yields NULL,
at least where I based my patch (99c33bed56 ("Git 2.25-rc0",
2019-12-25)). Quoting the entire get_reference():
> static struct object *get_reference(struct rev_info *revs, const char *name,
> const struct object_id *oid,
> unsigned int flags)
> {
> struct object *object;
>
> /*
> * If the repository has commit graphs, repo_parse_commit() avoids
> * reading the object buffer, so use it whenever possible.
> */
> if (oid_object_info(revs->repo, oid, NULL) == OBJ_COMMIT) {
> struct commit *c = lookup_commit(revs->repo, oid);
> if (!repo_parse_commit(revs->repo, c))
> object = (struct object *) c;
> else
> object = NULL;
> } else {
> object = parse_object(revs->repo, oid);
> }
No return statements at all prior to this line.
> if (!object) {
> if (revs->ignore_missing)
> return object;
Return NULL (the value of object).
> if (revs->exclude_promisor_objects && is_promisor_object(oid))
> return NULL;
Return NULL.
> die("bad object %s", name);
Die (so this function invocation never returns). In conclusion, if
object is NULL at this point in time, get_reference() either returns
NULL or dies.
> }
Since get_reference() did not return NULL or die, object is non-NULL
here.
> object->flags |= flags;
> return object;
Nothing has overridden object since, so we're returning non-NULL here.
> }
So I think get_reference() only returns NULL in those two safe cases.
(Or did I miss something?)
next prev parent reply other threads:[~2019-12-30 18:38 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-28 0:34 [PATCH] revision: allow missing promisor objects on CLI Jonathan Tan
2019-12-28 3:50 ` Junio C Hamano
2019-12-30 18:38 ` Jonathan Tan [this message]
2019-12-30 20:33 ` Junio C Hamano
2019-12-30 23:44 ` [PATCH v2] " Jonathan Tan
2019-12-31 0:09 ` Jonathan Nieder
2020-01-02 20:49 ` Jonathan Tan
2020-01-11 22:34 ` [PATCH v3 0/2] Un-regress rev-list --exclude-promisor-objects Jonathan Tan
2020-01-11 22:34 ` [PATCH v3 1/2] revision: document get_reference() Jonathan Tan
2020-03-25 20:46 ` Emily Shaffer
2020-01-11 22:34 ` [PATCH v3 2/2] revision: un-regress --exclude-promisor-objects Jonathan Tan
2020-03-25 20:50 ` Emily Shaffer
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=20191230183801.28538-1-jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=matvore@google.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).