From: Nanako Shiraishi <nanako3@lavabit.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, Johannes Sixt <j.sixt@viscovery.net>,
John Tapsell <johnflux@gmail.com>, Git List <git@vger.kernel.org>
Subject: Re: Confusing git pull error message
Date: Fri, 09 Oct 2009 07:01:22 +0900 [thread overview]
Message-ID: <20091009070122.6117@nanako3.lavabit.com> (raw)
In-Reply-To: <20091005193516.GB20078@coredump.intra.peff.net>
Quoting Jeff King <peff@peff.net>
> On Mon, Oct 05, 2009 at 03:12:57PM -0400, Jeff King wrote:
>
>> > I think you are right.
>>
>> Nope, I'm not. I figured out one more case that it needs to handle.
>> Revised patch coming up in a few minutes.
>
> OK, here it is, which I think covers all of the cases. I also re-wrapped
> the text, as I agree with JSixt that it was pretty ugly. I also
> re-wrapped some of the existing text, as it gave the very choppy:
>
> Your configuration specifies to merge the ref
> 'foo' from the remote, but no such ref
> was fetched.
>
> It would be really nice to just pipe it through 'fmt', but I suspect
> that will create portability problems.
>
> -- >8 --
> Subject: [PATCH] pull: improve advice for unconfigured error case
>
> There are several reasons a git-pull invocation might not
> have anything marked for merge:
>
> 1. We're not on a branch, so there is no branch
> configuration.
>
> 2. We're on a branch, but there is no configuration for
> this branch.
>
> 3. We fetched from the configured remote, but the
> configured branch to merge didn't get fetched (either
> it doesn't exist, or wasn't part of the fetch refspec).
>
> 4. We fetched from the non-default remote, but didn't
> specify a branch to merge. We can't use the configured
> one because it applies to the default remote.
>
> 5. We fetched from a specified remote, and a refspec was
> given, but it ended up not fetching anything (this is
> actually hard to do; if the refspec points to a remote
> branch and it doesn't exist, then fetch will fail and
> we never make it to this code path. But if you provide
> a wildcard refspec like
>
> refs/bogus/*:refs/remotes/origin/*
>
> then you can see this failure).
>
> We have handled (1) and (2) for some time. Recently, commit
> a6dbf88 added code to handle case (3).
>
> This patch handles cases (4) and (5), which previously just
> fell under other cases, producing a confusing message.
>
> While we're at it, let's rewrap the text for case (3), which
> looks terribly ugly as it is.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> git-pull.sh | 16 ++++++++++++----
> 1 files changed, 12 insertions(+), 4 deletions(-)
Junio, may I ask what happened to this patch?
next prev parent reply other threads:[~2009-10-08 22:03 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
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 [this message]
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=20091009070122.6117@nanako3.lavabit.com \
--to=nanako3@lavabit.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=johnflux@gmail.com \
--cc=peff@peff.net \
/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).