From: Daniel Barkalow <barkalow@iabervon.org>
Date: Fri, 14 Mar 2008 15:57:20 GMT
Subject: Re: git-fetch question/bug
Message-ID: <alpine.LNX.1.00.0803141148250.19665@iabervon.org>
In-Reply-To: <7vbq5hub74.fsf@gitster.siamese.dyndns.org>

On Thu, 13 Mar 2008, Junio C Hamano wrote:

> "Govind Salinas" <blix@sophiasuchtig.com> writes:
> 
> > ... git-fetch when I discovered that it does not return
> > error when the
> > fetch fails due to it not being a ff...
> 
> I think this is a regression introduced when "git-fetch" was
> re-implemented in C.  git-fetch--tool's native-store subcommand seems to
> have signaled this as an error, and it is reasonable to expect an error
> exit from the command in this case.
> 
> Probably something like this?

Looks right to me, although we should probably note that this probably 
means that if pull does a fetch that fails for some ref that you're not 
merging, it won't do the merge, even though it obviously could. So I think 
fixing this would presently (unless fetch and pull communicate more) be a 
regression for people whose upstreams introduce a new non-ff branch that 
matches their non-force fetch pattern.

	-Daniel
*This .sig left intentionally blank*