From: Jonathan Tan <jonathantanmy@google.com>
To: peff@peff.net
Cc: jonathantanmy@google.com, git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH v4 1/3] ls-refs: report unborn targets of symrefs
Date: Tue, 26 Jan 2021 10:13:58 -0800 [thread overview]
Message-ID: <20210126181358.2333028-1-jonathantanmy@google.com> (raw)
In-Reply-To: <YAnotHAiuSz4Du/0@coredump.intra.peff.net>
> On Tue, Dec 22, 2020 at 01:54:18PM -0800, Jonathan Tan wrote:
>
> > -static int ls_refs_config(const char *var, const char *value, void *data)
> > +static void send_possibly_unborn_head(struct ls_refs_data *data)
> > {
> > + struct strbuf namespaced = STRBUF_INIT;
> > + struct object_id oid;
> > + int flag;
> > + int oid_is_null;
> > +
> > + memset(&oid, 0, sizeof(oid));
> > + strbuf_addf(&namespaced, "%sHEAD", get_git_namespace());
> > + resolve_ref_unsafe(namespaced.buf, 0, &oid, &flag);
>
> It feels weird to call resolve_ref_unsafe() without checking the return
> value. How do we detect errors?
>
> I think the logic is that we make assumptions about which fields it will
> touch (i.e., zeroing the flags, and not touching our zero'd oid), and
> then check those. That feels a bit non-obvious and intimate with the
> implementation, though (and was presumably the source of the "oops, we
> need to clear the oid bug between v3 and v4).
>
> I feel like that deserves a comment, but I also wonder if:
>
> refname = resolve_ref_unsafe(namespaced.buf, 0, &oid, &flag);
> if (!refname)
> return; /* broken, bad name, not even a symref, etc */
From my reading of this part of refs_resolve_ref_unsafe():
if (!(read_flags & REF_ISSYMREF)) {
if (*flags & REF_BAD_NAME) {
oidclr(oid);
*flags |= REF_ISBROKEN;
}
return refname;
}
it seems that resolve_ref_unsafe() returns non-NULL if the ref is not a
symref but is otherwise valid. But this is exactly what we want -
send_possibly_unborn_head() must send HEAD in this situation anyway.
Thanks - I've switched to checking the return value.
(It was a bit confusing that refs_resolve_ref_unsafe() returns one of
its input arguments if it succeeds and NULL if it fails, but that's
outside the scope of this patch, I think.)
> > + if (!oid_is_null ||
> > + (data->unborn && data->symrefs && (flag & REF_ISSYMREF)))
> > + send_ref(namespaced.buf, oid_is_null ? NULL : &oid, flag, data);
>
> It likewise feels a bit funny that we determine the symref name in the
> earlier call to resolve_ref_unsafe(), but we do not pass it here (and in
> fact, we'll end up looking it up again!).
>
> But that is not much different than what we do for normal refs passed to
> the send_ref() callback. It would be nice if the iteration could pass in
> "by the way, here is the symref value" to avoid that.
Yes, that would be nice.
> But in practice it
> isn't a big deal, since we only do the lookup when we see the ISSYMREF
> flag set. So typically it is only one or two extra ref resolutions.
OK.
> > @@ -91,7 +118,7 @@ int ls_refs(struct repository *r, struct strvec *keys,
> >
> > memset(&data, 0, sizeof(data));
> >
> > - git_config(ls_refs_config, NULL);
> > + git_config(ls_refs_config, &data);
>
> You will probably not be surprised that I would suggest defaulting
> data->allow_unborn to 1 before this config call. :)
I don't think many people have made comments either way, so I'll go
ahead with defaulting it to true. I can see arguments for both sides.
> > @@ -103,14 +130,31 @@ int ls_refs(struct repository *r, struct strvec *keys,
> > data.symrefs = 1;
> > else if (skip_prefix(arg, "ref-prefix ", &out))
> > strvec_push(&data.prefixes, out);
> > + else if (data.allow_unborn && !strcmp("unborn", arg))
> > + data.unborn = 1;
> > }
>
> So if we have not set allow_unborn, we will not accept the client saying
> "unborn". Which makes sense, because we would not have advertised it in
> that case.
>
> But we use the same boolean for advertising, too. So this loses the
> "allow us to accept it, but not advertise it" logic that your earlier
> versions had, doesn't it?
Yes, it does.
> And that is the important element for making
> things work across a non-atomic deploy of versions.
>
> This straight-boolean version works as long as you can atomically update
> the _config_ on each version. But that seems like roughly the same
> problem (having dealt with this on GitHub servers, they are not
> equivalent, and depending on your infrastructure, it definitely _can_ be
> easier to do one versus the other. But it seems like a funny place to
> leave this upstream feature).
Well, I was just agreeing with what you said [1]. :-)
[1] https://lore.kernel.org/git/X9xJLWdFJfNJTn0p@coredump.intra.peff.net/
> Or is the intent that an unconfigured reader would silently ignore the
> unborn flag in that case? That would at least not cause it to bail on
> the client in a mixed-version environment. But it does feel like a
> confusing result.
Right now, an old server would ignore "unborn", yes. I'm not sure of
what the intent should be - tightening ls-refs and fetch to forbid
unknown arguments seems like a good idea to me.
next prev parent reply other threads:[~2021-01-26 22:30 UTC|newest]
Thread overview: 109+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-08 1:31 Cloning empty repository uses locally configured default branch name Jonathan Tan
2020-12-08 2:16 ` Junio C Hamano
2020-12-08 2:32 ` brian m. carlson
2020-12-08 18:55 ` Jonathan Tan
2020-12-08 21:00 ` Junio C Hamano
2020-12-08 15:58 ` Jeff King
2020-12-08 20:06 ` Jonathan Tan
2020-12-08 21:15 ` Jeff King
2020-12-11 21:05 ` [PATCH] clone: in protocol v2, use remote's default branch Jonathan Tan
2020-12-11 23:41 ` Junio C Hamano
2020-12-14 12:38 ` Ævar Arnfjörð Bjarmason
2020-12-14 15:51 ` Felipe Contreras
2020-12-14 16:30 ` Junio C Hamano
2020-12-15 1:41 ` Ævar Arnfjörð Bjarmason
2020-12-15 2:22 ` Junio C Hamano
2020-12-15 2:38 ` Jeff King
2020-12-15 2:55 ` Junio C Hamano
2020-12-15 4:36 ` Jeff King
2020-12-16 3:09 ` Junio C Hamano
2020-12-16 18:39 ` Jeff King
2020-12-16 20:56 ` Junio C Hamano
2020-12-18 6:19 ` Jeff King
2020-12-15 3:22 ` Felipe Contreras
2020-12-14 19:25 ` Jonathan Tan
2020-12-14 19:42 ` Felipe Contreras
2020-12-15 1:27 ` Jeff King
2020-12-15 19:10 ` Jonathan Tan
2020-12-16 2:07 ` [PATCH v2 0/3] Cloning with remote unborn HEAD Jonathan Tan
2020-12-16 2:07 ` [PATCH v2 1/3] ls-refs: report unborn targets of symrefs Jonathan Tan
2020-12-16 6:16 ` Junio C Hamano
2020-12-16 23:49 ` Jonathan Tan
2020-12-16 18:23 ` Jeff King
2020-12-16 23:54 ` Jonathan Tan
2020-12-17 1:32 ` Junio C Hamano
2020-12-18 6:16 ` Jeff King
2020-12-16 2:07 ` [PATCH v2 2/3] connect, transport: add no-op arg for future patch Jonathan Tan
2020-12-16 6:20 ` Junio C Hamano
2020-12-16 2:07 ` [PATCH v2 3/3] clone: respect remote unborn HEAD Jonathan Tan
2020-12-21 22:30 ` [PATCH v3 0/3] Cloning with " Jonathan Tan
2020-12-21 22:30 ` [PATCH v3 1/3] ls-refs: report unborn targets of symrefs Jonathan Tan
2020-12-21 22:31 ` [PATCH v3 2/3] connect, transport: add no-op arg for future patch Jonathan Tan
2020-12-21 22:31 ` [PATCH v3 3/3] clone: respect remote unborn HEAD Jonathan Tan
2020-12-21 23:48 ` [PATCH v3 0/3] Cloning with " Junio C Hamano
2021-01-21 20:14 ` Jeff King
2020-12-22 21:54 ` [PATCH v4 " Jonathan Tan
2020-12-22 21:54 ` [PATCH v4 1/3] ls-refs: report unborn targets of symrefs Jonathan Tan
2021-01-21 20:48 ` Jeff King
2021-01-26 18:13 ` Jonathan Tan [this message]
2021-01-26 23:16 ` Jeff King
2020-12-22 21:54 ` [PATCH v4 2/3] connect, transport: add no-op arg for future patch Jonathan Tan
2021-01-21 20:55 ` Jeff King
2021-01-26 18:16 ` Jonathan Tan
2020-12-22 21:54 ` [PATCH v4 3/3] clone: respect remote unborn HEAD Jonathan Tan
2021-01-21 21:02 ` Jeff King
2021-01-26 18:22 ` Jonathan Tan
2021-01-26 23:04 ` Jeff King
2021-01-28 5:50 ` Junio C Hamano
2020-12-22 22:06 ` [PATCH v4 0/3] Cloning with " Junio C Hamano
2021-01-26 18:55 ` [PATCH v5 " Jonathan Tan
2021-01-26 18:55 ` [PATCH v5 1/3] ls-refs: report unborn targets of symrefs Jonathan Tan
2021-01-26 21:38 ` Junio C Hamano
2021-01-26 23:03 ` Junio C Hamano
2021-01-30 3:55 ` Jonathan Tan
2021-01-26 23:20 ` Jeff King
2021-01-26 23:38 ` Junio C Hamano
2021-01-29 20:23 ` Jonathan Tan
2021-01-29 22:04 ` Junio C Hamano
2021-02-02 2:20 ` Jonathan Tan
2021-02-02 5:00 ` Junio C Hamano
2021-01-27 1:28 ` Ævar Arnfjörð Bjarmason
2021-01-30 4:04 ` Jonathan Tan
2021-01-26 18:55 ` [PATCH v5 2/3] connect, transport: encapsulate arg in struct Jonathan Tan
2021-01-26 21:54 ` Junio C Hamano
2021-01-30 4:06 ` Jonathan Tan
2021-01-26 18:55 ` [PATCH v5 3/3] clone: respect remote unborn HEAD Jonathan Tan
2021-01-26 22:24 ` Junio C Hamano
2021-01-30 4:27 ` Jonathan Tan
2021-01-27 1:11 ` [PATCH v5 0/3] Cloning with " Junio C Hamano
2021-01-27 4:25 ` Jeff King
2021-01-27 6:14 ` Junio C Hamano
2021-01-27 1:41 ` Ævar Arnfjörð Bjarmason
2021-01-30 4:41 ` Jonathan Tan
2021-01-30 11:13 ` Ævar Arnfjörð Bjarmason
2021-02-02 2:22 ` Jonathan Tan
2021-02-03 14:23 ` Ævar Arnfjörð Bjarmason
2021-02-05 22:28 ` Junio C Hamano
2021-02-02 2:14 ` [PATCH v6 " Jonathan Tan
2021-02-02 2:14 ` [PATCH v6 1/3] ls-refs: report unborn targets of symrefs Jonathan Tan
2021-02-02 16:55 ` Junio C Hamano
2021-02-02 18:34 ` Jonathan Tan
2021-02-02 22:17 ` Junio C Hamano
2021-02-03 1:04 ` Jonathan Tan
2021-02-02 2:15 ` [PATCH v6 2/3] connect, transport: encapsulate arg in struct Jonathan Tan
2021-02-02 2:15 ` [PATCH v6 3/3] clone: respect remote unborn HEAD Jonathan Tan
2021-02-05 4:58 ` [PATCH v7 0/3] Cloning with " Jonathan Tan
2021-02-05 4:58 ` [PATCH v7 1/3] ls-refs: report unborn targets of symrefs Jonathan Tan
2021-02-05 16:10 ` Jeff King
2021-02-05 4:58 ` [PATCH v7 2/3] connect, transport: encapsulate arg in struct Jonathan Tan
2021-02-05 4:58 ` [PATCH v7 3/3] clone: respect remote unborn HEAD Jonathan Tan
2021-02-05 5:25 ` [PATCH v7 0/3] Cloning with " Junio C Hamano
2021-02-05 16:15 ` Jeff King
2021-02-05 21:15 ` Ævar Arnfjörð Bjarmason
2021-02-05 23:07 ` Junio C Hamano
2021-02-05 20:48 ` [PATCH v8 " Jonathan Tan
2021-02-05 20:48 ` [PATCH v8 1/3] ls-refs: report unborn targets of symrefs Jonathan Tan
2021-02-05 20:48 ` [PATCH v8 2/3] connect, transport: encapsulate arg in struct Jonathan Tan
2021-02-05 20:48 ` [PATCH v8 3/3] clone: respect remote unborn HEAD Jonathan Tan
2021-02-06 18:51 ` [PATCH v8 0/3] Cloning with " Junio C Hamano
2021-02-08 22:28 ` Junio C Hamano
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=20210126181358.2333028-1-jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).