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: Thu, 16 May 2013 18:07:47 -0500 [thread overview]
Message-ID: <CAMP44s2W5MUneTwcSnr=Ey715paKgSL6MqXmYKdSmw4NqdL4qQ@mail.gmail.com> (raw)
In-Reply-To: <7vk3my6bu1.fsf@alter.siamese.dyndns.org>
On Thu, May 16, 2013 at 1:04 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Felipe Contreras <felipe.contreras@gmail.com> writes:
>
>>> If you come from "git pull" is "git fetch" + "git merge",
>>> and if your current branch is integrating with your local branch,
>>
>> How many times do I have to say that 'git pull' is not 'git fetch' +
>> 'git merge'?
>>
>> You must think everybody has 'merge.defaulttoupstream=true'.
>
> I am confused. What does that have anything to do with this topic?
> It only affects what a lazy "git merge" (without any other parameter
> on the command line) does, doesn't it?
And that's what we are talking about here; commands without any other
parameter in the command like.
So "git pull $nothing" is *not* "git fetch $nothing" + "git merge $nothing".
> In the above "git fetch" + "git merge", I did not mean "git merge"
> is literally what the command line of the command invoked
> internally. "git pull" of course chooses what is to be merged.
>
> But that does not change the fact that before merging (or rebasing,
> if you are running "git pull --rebase"), "git fetch" is done in
> order to make sure the history you are merging with (or rebasing on
> top of) is available locally and FETCH_HEAD is prepared so that "git
> pull" can decide what to merge with (or rebase on).
We are not talking about 'git pull .', we are talking about 'git fetch
.', and it doesn't make any sense.
> The merge.defaultToUpstream configuration does not change that, does
> it?
It changes the equation 'git pull' = 'git fetch' + 'git merge'.
--
Felipe Contreras
next prev parent reply other threads:[~2013-05-16 23:07 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 [this message]
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
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='CAMP44s2W5MUneTwcSnr=Ey715paKgSL6MqXmYKdSmw4NqdL4qQ@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).