Re: [PATCH] pull: refuse complete src:dst fetchspec arguments

From: Daniel Barkalow <barkalow@iabervon.org>
Date: Oct 21, 2009, 04:32 UTC
Message-ID: <alpine.LNX.2.00.0910210023050.14365@iabervon.org>
In-Reply-To: <20091021031528.GB18997@atjola.homenet>

On Wed, 21 Oct 2009, Björn Steinbrink wrote:

Show 17 quoted lines

> On 2009.10.20 20:55:25 -0400, Daniel Barkalow wrote:
> > Maybe it should be fine to do:
> > 
> > $ git fetch long-url-here master:temp
> > $ git merge temp
> > $ git checkout other-branch-that-also-needs-it
> > $ git merge temp
> > 
> > But "temp" is "refs/remotes/temp", not "refs/heads/temp"?
> 
> One (maybe important) difference there is that the "pull" gets you:
> 
>     Merge branch 'pu' of git://git.kernel.org/pub/scm/git/git
> 
> Even with "master:tmp". But with fetch+merge (storing in refs/remotes):
> 
>     Merge remote branch 'tmp'

It would be nice to improve that in general, I think. You may fetch before merging in order to check out what you're getting, and then lose FETCH_HEAD (or have not specified the branch), and you have to contact the remote server again if you want the message with its url.

> As a minor side-effect, having the "tmp" ref makes re-running the pull
> (for whatever reason) cheaper, as without it, the fetch step would
> possibly re-fetch the whole stuff (not reachable through any local ref).

Only if the merge failed, but yes.

	-Daniel
*This .sig left intentionally blank*