From: Steffen Prohaska <prohaska@zib.de>
Date: Sat, 03 Nov 2007 07:08:55 GMT
Subject: Re: [PATCH] errors: "strict subset" -> "ancestor"
Message-ID: <A4169B7B-C05B-4CA0-B41B-E1E2D71491B6@zib.de>
In-Reply-To: <20071103023944.GA15379@fieldses.org>


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'.

	Steffen