From: "David Symonds" <dsymonds@gmail.com>
To: "Steffen Prohaska" <prohaska@zib.de>
Cc: "J. Bruce Fields" <bfields@fieldses.org>,
"Junio C Hamano" <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: [PATCH] errors: "strict subset" -> "ancestor"
Date: Sat, 3 Nov 2007 18:14:06 +1100 [thread overview]
Message-ID: <ee77f5c20711030014x23ac6206rec81fe5968992147@mail.gmail.com> (raw)
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.
next prev parent reply other threads:[~2007-11-03 7:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-03 2:39 [PATCH] errors: "strict subset" -> "ancestor" J. Bruce Fields
2007-11-03 7:08 ` Steffen Prohaska
2007-11-03 7:14 ` David Symonds [this message]
2007-11-03 7:24 ` Steffen Prohaska
2007-11-04 21:59 ` J. Bruce Fields
2007-11-05 13:06 ` Wincent Colaiuta
2007-11-05 21:28 ` Jeff King
2007-11-03 7:51 ` Steffen Prohaska
2007-11-04 22:08 ` J. Bruce Fields
2007-11-04 23:13 ` Steffen Prohaska
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=ee77f5c20711030014x23ac6206rec81fe5968992147@mail.gmail.com \
--to=dsymonds@gmail.com \
--cc=bfields@fieldses.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=prohaska@zib.de \
/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).