From: Felipe Contreras <felipe.contreras@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
Git <git@vger.kernel.org>, "Jeff King" <peff@peff.net>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Dominik Salvet" <dominik.salvet@gmail.com>
Subject: Re: [RFC/PATCH] Add fetch.updateHead option
Date: Wed, 18 Nov 2020 13:04:54 -0600 [thread overview]
Message-ID: <CAMP44s0Wvb_czYs6jaG=iwSOuGWvjksNo_sjjg3EKx18Ex2Fig@mail.gmail.com> (raw)
In-Reply-To: <xmqqwnyi3bml.fsf@gitster.c.googlers.com>
On Wed, Nov 18, 2020 at 9:53 AM Junio C Hamano <gitster@pobox.com> wrote:
> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> > I haven't taken much time to re-think through the patch/implications of
> > this, but I remember running into this and going through some pre-patch
> > investigation at some point.
> >
> > It's really annoying in some cases that "clone" isn't creating the same
> > state as "remote". IIRC I was doing some heuristics to figure out the
> > remote branch name etc.
> >
> > Isn't this something we can just change without an option? There were a
> > bunch of cases in clone/fetch that were different for no different
> > reasons, IIRC I patched one or two of those in the past. But I haven't
> > gone through the history of the feature and checked if it was
> > intentional.
>
> I think what Peff outlined earlier was reasonable. "remote add -f",
> since it talks with the remote, should be able to learn where their
> HEAD points at and set it up. "remote add" that does not talk to
> the remote cannot do so and "fetch" could help but we should not
> touch existing refs/remotes/$name/HEAD by default [*1*], as the
> symref is meant to indicate the local choice of which one of their
> branches is significant to _us_ and what "clone" does is merely to
> give it the initial value.
The new suggested behavior (fetch.updatehead = missing) is that "git
fetch" touches $remote/HEAD *only* when it doesn't exist.
So if you set $remote/HEAD manually, you would not affected.
However, that behavior is clearly not ideal in the long term, since it
seems basically nobody uses that feature.
Either way I see no argument against adding this option, and making
the default fetch.updatehead = never, which doesn't change the current
behavior at all.
> But when interacting with a remote whose choice of HEAD is always
> what the local user wants to follow, letting "git fetch" update
> refs/remotes/$name/HEAD to a newly observed value would be a welcome
> optional feature.
That would be fetch.updatehead = always.
Cheers.
--
Felipe Contreras
next prev parent reply other threads:[~2020-11-18 19:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-18 9:12 [RFC/PATCH] Add fetch.updateHead option Felipe Contreras
2020-11-18 9:30 ` Ævar Arnfjörð Bjarmason
2020-11-18 9:43 ` Felipe Contreras
2020-11-18 15:53 ` Junio C Hamano
2020-11-18 19:04 ` Felipe Contreras [this message]
2020-11-20 23:52 ` Jeff King
2020-11-21 0:28 ` Junio C Hamano
2020-11-21 0:40 ` Jeff King
2020-11-21 1:18 ` Felipe Contreras
2020-11-24 6:58 ` Jeff King
2020-11-21 1:53 ` Felipe Contreras
2020-11-21 1:41 ` Felipe Contreras
2020-11-24 7:09 ` Jeff King
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='CAMP44s0Wvb_czYs6jaG=iwSOuGWvjksNo_sjjg3EKx18Ex2Fig@mail.gmail.com' \
--to=felipe.contreras@gmail.com \
--cc=avarab@gmail.com \
--cc=dominik.salvet@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.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).