From: Sverre Rabbelier <srabbelier@gmail.com>
Date: Sat, 12 Sep 2009 21:37:47 GMT
Subject: Re: Confusing git pull error message
Message-ID: <fabb9a1e0909121437q4eb432e3idde98993ac552b5@mail.gmail.com>
In-Reply-To: <20090912211119.GA30966@coredump.intra.peff.net>

Heya,

On Sat, Sep 12, 2009 at 23:11, Jeff King <peff@peff.net> wrote:
>        if [ -z "$curr_branch" ]; then
>                echo "You are not currently on a branch, so I cannot use any"
> @@ -96,7 +99,7 @@ error_on_no_merge_candidates () {
>                echo "Please specify which branch you want to merge on the command"
>                echo "line and try again (e.g. 'git pull <repository> <refspec>')."
>                echo "See git-pull(1) for details."
> -       else
> +       elif [ -z "$upstream" ]; then
>                echo "You asked me to pull without telling me which branch you"
>                echo "want to merge with, and 'branch.${curr_branch}.merge' in"
>                echo "your configuration file does not tell me either.  Please"
> @@ -114,6 +117,10 @@ error_on_no_merge_candidates () {
>                echo "    remote.<nickname>.fetch = <refspec>"
>                echo
>                echo "See git-config(1) for details."
> +       else
> +               echo "Your configuration specified for us to pull the ref"
> +               echo "'$upstream_short', but we were unable to fetch it from"
> +               echo "the remote."
>        fi
>        exit 1
>  }

Pretty bad case of multiple personality disorder here? At first
there's a "me", then again a "me", and then all of a sudden a "we"?

-- 
Cheers,

Sverre Rabbelier