Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: "Santi Béjar" <sbejar@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH/RFC] git-fetch: Only fetch in fetch
Date: Wed, 24 Jan 2007 17:13:02 -0800	[thread overview]
Message-ID: <7vhcufc3j5.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: 8aa486160701241652x375f0d0eoba1cdf3d14550034@mail.gmail.com

"Santi Béjar" <sbejar@gmail.com> writes:

> On 1/25/07, Santi Béjar <sbejar@gmail.com> wrote:
>>    I've tried to separate the fetch and merge logic. At the same time it
>>    has removed 40 lines of code to the git-*.sh.
>
> Just some words for the basic idea.
>
> git-fetch: fetches the branches from the remote and save this
> information in .git/FETCH_HEAD. In .git/FETCH_REMOTE it save
> additional information, as the remote nick, the remote url, the
> refspec used and the default remote.
>
> git-pull: uses this information to select the branches to merge and
> save them in .git/FETCH_MERGE.

One thing I suspect is problematic is that this would make
fmt-merge-message much less useful after running git-fetch.  You
have to go all the way to git-pull and replace reading from
FETCH_HEAD with reading from FETCH_MERGE (just like you had to
do that in git-pull).  In other words, this may break people's
scripts and workflows.

This is probably a good clean-up at the conceptual level.  If
you had done this before v1.0.0 there would have been no
question about its inclusion.

Please discuss this patch post 1.5.0.

  reply	other threads:[~2007-01-25  1:13 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-25  0:43 [PATCH/RFC] git-fetch: Only fetch in fetch Santi Béjar
2007-01-25  0:52 ` Santi Béjar
2007-01-25  1:13   ` Junio C Hamano [this message]
     [not found]     ` <8aa486160701242344y465ff541i6d4d4b46a96bda64@mail.gmail.com>
2007-01-25  9:37       ` Santi Béjar

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vhcufc3j5.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=git@vger.kernel.org \
    --cc=sbejar@gmail.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox