From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: John Tapsell <johnflux@gmail.com>, Git List <git@vger.kernel.org>
Subject: Re: Confusing git pull error message
Date: Sun, 13 Sep 2009 16:42:31 -0400 [thread overview]
Message-ID: <20090913204231.GA8654@coredump.intra.peff.net> (raw)
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
next prev parent reply other threads:[~2009-09-13 20:42 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-12 20:01 Confusing git pull error message John Tapsell
2009-09-12 21:11 ` Jeff King
2009-09-12 21:31 ` John Tapsell
2009-09-12 22:34 ` Jeff King
2009-09-12 21:37 ` Sverre Rabbelier
2009-09-12 22:31 ` Jeff King
2009-09-12 22:37 ` Sverre Rabbelier
2009-09-13 20:38 ` Junio C Hamano
2009-09-13 20:42 ` Jeff King [this message]
2009-09-13 20:57 ` John Tapsell
2009-09-13 21:18 ` Junio C Hamano
2009-09-13 20:57 ` Junio C Hamano
2009-09-13 21:36 ` Jeff King
2009-09-13 22:11 ` Junio C Hamano
2009-09-13 21:16 ` Junio C Hamano
2009-09-13 22:39 ` Jeff King
2009-09-14 11:14 ` Jeff King
2009-10-05 11:32 ` Johannes Sixt
2009-10-05 11:53 ` Jeff King
2009-10-05 12:13 ` Johannes Sixt
2009-10-05 19:08 ` Junio C Hamano
2009-10-05 19:12 ` Jeff King
2009-10-05 19:35 ` Jeff King
2009-10-08 22:01 ` Nanako Shiraishi
2009-10-09 7:38 ` Junio C Hamano
2009-10-10 0:57 ` Junio C Hamano
2009-10-05 19:36 ` Junio C Hamano
2009-10-05 22:00 ` Jeff King
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=20090913204231.GA8654@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johnflux@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;
as well as URLs for NNTP newsgroup(s).