From: Felipe Contreras <felipe.contreras@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jens Lehmann <Jens.Lehmann@web.de>
Subject: Re: [PATCH 1/3] fetch: add --allow-local option
Date: Sat, 18 May 2013 07:25:37 -0500 [thread overview]
Message-ID: <CAMP44s3xdWzVviPvrN7D1fTG6Lwgg-dEzju--VuiwZA-8bV+MQ@mail.gmail.com> (raw)
In-Reply-To: <7vtxm1xxvd.fsf@alter.siamese.dyndns.org>
On Fri, May 17, 2013 at 1:30 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Felipe Contreras <felipe.contreras@gmail.com> writes:
>
>> This is irrelevant, it's an implementation detail of 'git pull'. *THE
>> USER* is not running 'git fetch .'
>
> To those who fear running "git pull", the following has worked as a
> quick way to "preview" what they would be getting.
>
> git fetch
> git log ..FETCH_HEAD
>
> and then they can "git merge FETCH_HEAD" to conclude it, or run a
> "git pull" for real. We teach the more explicit form to end users
> in our tutorial,
That "tutorial" is mostly irrelevant; it has not been properly updated
in years, and it doesn't do it's job properly.
Nowadays most people use the Pro Git book, which doesn't mention
FETCH_HEAD even once. And why would it? It's not a useful concept for
typical users.
> So when "the user" is running "git fetch" on "mywork" branch that
> happens to be forked from a local "master", i.e. her configuration
> is set as
>
> [branch "mywork"]
> remote = .
> merge = refs/heads/master
>
> we still need to have FETCH_HEAD updated to point at what we would
> be merging if she did a "git pull".
No, we don't need that. That is only needed by 'git pull', and in
fact, it should be possible to reimplement 'git pull' so that it skips
FETCH_HEAD when the remote is local.
These are mere implementation details.
> As I said in the very beginning, it was a mistake for me to suggest
> adding a special case behaviour for '.' remote in the first place.
> It breaks a long-standing expectation and workflow built around it.
The fact that it's "long-standing" doesn't mean it's sane.
> So sorry for wasting our time, and consider this as a misguided
> excursion.
It doesn't matter, the problem that 'git fetch' does something totally
and completely uses is still there.
--
Felipe Contreras
next prev parent reply other threads:[~2013-05-18 12:25 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-16 7:31 [PATCH 0/3] fetch: fix '.' fetching Felipe Contreras
2013-05-16 7:31 ` [PATCH 1/3] fetch: add --allow-local option Felipe Contreras
2013-05-16 8:25 ` Ramkumar Ramachandra
2013-05-16 8:53 ` Felipe Contreras
2013-05-16 9:27 ` Ramkumar Ramachandra
2013-05-16 9:34 ` Felipe Contreras
2013-05-16 9:58 ` Ramkumar Ramachandra
2013-05-16 10:27 ` Felipe Contreras
2013-05-16 10:32 ` Ramkumar Ramachandra
2013-05-16 12:54 ` Felipe Contreras
2013-05-16 15:58 ` Junio C Hamano
2013-05-16 16:26 ` Felipe Contreras
2013-05-16 16:38 ` Junio C Hamano
2013-05-16 16:52 ` Felipe Contreras
2013-05-16 18:04 ` Junio C Hamano
2013-05-16 23:07 ` Felipe Contreras
2013-05-16 23:24 ` Junio C Hamano
2013-05-17 0:04 ` Felipe Contreras
2013-05-17 18:30 ` Junio C Hamano
2013-05-18 12:25 ` Felipe Contreras [this message]
2013-05-19 5:51 ` Junio C Hamano
2013-05-19 6:10 ` Felipe Contreras
2013-05-19 7:56 ` About overzealous compatibility Felipe Contreras
2013-05-19 14:27 ` Felipe Contreras
2013-05-18 13:12 ` [PATCH 1/3] fetch: add --allow-local option Philip Oakley
2013-05-18 14:23 ` Felipe Contreras
2013-05-18 20:53 ` Philip Oakley
2013-05-18 22:26 ` Felipe Contreras
2013-05-19 6:10 ` Junio C Hamano
2013-05-16 7:31 ` [PATCH 2/3] fetch: switch allow-local off by default Felipe Contreras
2013-05-16 7:31 ` [PATCH 3/3] remote: disable allow-local for pushes Felipe Contreras
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=CAMP44s3xdWzVviPvrN7D1fTG6Lwgg-dEzju--VuiwZA-8bV+MQ@mail.gmail.com \
--to=felipe.contreras@gmail.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).