From: Jeff King <peff@peff.net>
Date: Sun, 13 Sep 2009 20:42:31 GMT
Subject: Re: Confusing git pull error message
Message-ID: <20090913204231.GA8654@coredump.intra.peff.net>
In-Reply-To: <7v1vmar353.fsf@alter.siamese.dyndns.org>

On Sun, Sep 13, 2009 at 01:38:48PM -0700, Junio C Hamano wrote:

> I saw some discussion on improving the wording.  Here is what I plan to
> commit.

Thanks for picking this up, I meant to re-post with improvements.

> +	else
> +		echo "Your configuration specifies to merge the ref"
> +		echo "'${upstream#refs/heads/}' from the remote, but no such ref"
> +		echo "was fetched."

What you have here is precisely what we observed. But I think one of the
complaints was to say more explicitly "that ref doesn't exist on the
remote", which I think should be the case if we have got to this point
(anything else would have triggered an error in fetch).

I don't have a strong feeling either way, though.

-Peff