On Fri, Nov 20, 2020 at 5:52 PM Jeff King <peff@xxxxxxxx> wrote:
> On Wed, Nov 18, 2020 at 03:12:19AM -0600, Felipe Contreras wrote:
> > +static void update_head(int config, const struct ref *head, const struct remote *remote)
> > +{
> > + struct strbuf ref = STRBUF_INIT, target = STRBUF_INIT;
> > + const char *r, *head_name = NULL;
> > +
> > + if (!head || !head->symref || !remote)
> > + return;
>
> I'd expect us to return early here, as well, if the config is set to
> "never". I think your function will usually still do the right thing
> (because we return early before writing), but it makes a pointless
> lookup of the current origin/HEAD. But see below.
If the config is set to "never", the function update_head is never
called, since the boolean need_update_head is never set in the outer
function.
I don't like the convolutedness of this approach, but couldn't think
of anything better.
> > + strbuf_addf(&ref, "refs/remotes/%s/HEAD", remote->name);
> > + skip_prefix(head->symref, "refs/heads/", &head_name);
>
> Should we bail or complain if this skip_prefix() doesn't match? I think
> it would be a sign of weirdness on the remote side, since HEAD is never
> supposed to point to anything except refs/heads/. But if we ever did see
> it, it's probably better to bail than to point to
> refs/remotes/origin/refs/foo/bar or whatever.
OK. An extra check doesn't hurt.
> > + strbuf_addf(&target, "refs/remotes/%s/%s", remote->name, head_name);
> > +
> > + r = refs_resolve_ref_unsafe(get_main_ref_store(the_repository),
> > + ref.buf, RESOLVE_REF_READING,
> > + NULL, NULL);
>
> This won't resolve a symref pointing to an unborn branch, so it would
> count as "missing". I.e.:
>
> git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/nope
> git -c fetch.updatehead=missing fetch
>
> will update it based on the remote HEAD. I guess I could see some
> argument for defining "missing" in that way, but I suspect it is not
> what somebody in this situation would expect.
>
> I think it's hard to get into this situation intentionally. If you clone
> an empty repo, we won't write the symref at all (since we have nothing
> to write into it), so both sides would be missing. But it's easy enough
> to do the right thing; see symbolic-ref.c's check_symref() function
> (basically drop the READING flag).
>
> Likewise, I'd not expect to see a non-symref at that name, but what
> should we do if we see one? I think overwrite it for "always", but not
> for "missing". You can tell the difference by checking REF_ISSYMREF in
> the returned flags, though the distinction may not matter if we follow
> the semantics I just said.
All right. So, still checking if REF_ISSYMREF is set, just in case.
> > + if (r) {
> > + if (config == FETCH_UPDATE_HEAD_MISSING)
> > + /* already present */
> > + return;
> > + else if (config == FETCH_UPDATE_HEAD_ALWAYS && !strcmp(r, target.buf))
> > + /* already up-to-date */
> > + return;
> > + else
> > + /* should never happen */
> > + return;
> > + }
> > +
> > + if (create_symref(ref.buf, target.buf, "remote update head"))
> > + warning(_("could not set remote head"));
> > +}
>
> If we do update the symref, we should probably tell the user. Better
> still if we can print it as part of the usual fetch output table.
Agreed.
> > @@ -1382,8 +1420,18 @@ static int do_fetch(struct transport *transport,
> > break;
> > }
> > }
> > - } else if (transport->remote && transport->remote->fetch.nr)
> > + } else if (transport->remote && transport->remote->fetch.nr) {
> > + if (transport->remote->update_head)
> > + update_head_config = transport->remote->update_head;
> > + else
> > + update_head_config = fetch_update_head;
> > +
> > + need_update_head = update_head_config && update_head_config != FETCH_UPDATE_HEAD_NEVER;
> > +
> > + if (need_update_head)
> > + strvec_push(&ref_prefixes, "HEAD");
> > refspec_ref_prefixes(&transport->remote->fetch, &ref_prefixes);
> > + }
>
> Good catch. We need this for:
>
> git fetch origin
>
> since otherwise it doesn't ask about HEAD in a v2 exchange. What about:
>
> git fetch origin master
>
> That won't report on HEAD either, even with your patch, because it hits
> the part of the conditional before your "else if". What should it do? I
> can see an argument for "nothing, we only update head on full configured
> fetches", but if so we should definitely make that clear in the
> documentation. I can also see an argument for "always, if we happen to
> have heard about it" (just like we opportunistically update tracking
> refs even if they are fetched by name into FETCH_HEAD).
I don't see the point in complicating the code for those corner-cases.
And I also don't see how HEAD can be fetched unless we specifically
ask for it. What would that command look like?
Also, there's two optimizations that apparently went unnoticed:
1. In the case of "missing". We could preemptively check if there's
already an "origin/HEAD" before adding "HEAD" to the prefixes (and
setting need_update_head). That would probably complicate the code.
2. Also in the case of "missing". There's no point in building the
"target" string buffer, since we are never going to compare it to
anything. Again, this would complicate the code.
I decided against these in v1 because as I already stated: it
complicates the code.
Plus, I forgot to release the string buffers (I'm glad nobody
noticed). That will be in v2.
Cheers.
Cheers.
--
Felipe Contreras
