From: David Symonds <dsymonds@gmail.com>
Date: Sat, 03 Nov 2007 07:14:06 GMT
Subject: Re: [PATCH] errors: "strict subset" -> "ancestor"
Message-ID: <ee77f5c20711030014x23ac6206rec81fe5968992147@mail.gmail.com>
In-Reply-To: <A4169B7B-C05B-4CA0-B41B-E1E2D71491B6@zib.de>

On 11/3/07, Steffen Prohaska <prohaska@zib.de> wrote:
>
> On Nov 3, 2007, at 3:39 AM, J. Bruce Fields wrote:
>
> > diff --git a/send-pack.c b/send-pack.c
> > index 5e127a1..b74fd45 100644
> > --- a/send-pack.c
> > +++ b/send-pack.c
> > @@ -297,9 +297,9 @@ static int send_pack(int in, int out, struct
> > remote *remote, int nr_refspec, cha
> >                                * commits at the remote end and likely
> >                                * we were not up to date to begin with.
> >                                */
> > -                             error("remote '%s' is not a strict "
> > -                                   "subset of local ref '%s'. "
> > -                                   "maybe you are not up-to-date and "
> > +                             error("remote '%s' is not an ancestor of\n"
> > +                                   " local  '%s'.\n"
>
> Two spaces in a row after local and before '%s'.

So? That's presumably to align the remote and local strings.


Dave.