Re: [PATCH] errors: "strict subset" -> "ancestor"

On Nov 3, 2007, at 8:14 AM, David Symonds wrote:

On 11/3/07, Steffen Prohaska [off-list ref] wrote:

quoted

On Nov 3, 2007, at 3:39 AM, J. Bruce Fields wrote:

quoted

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.

They are not aligned. The second line is indented with one
space. Look at examples in the commit message. The first line
starts with "error:", which already destroys the alignment.

	Steffen