El 3/11/2007, a las 8:14, David Symonds escribió:
On 11/3/07, Steffen Prohaska <prohaska@xxxxxx> 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.
Kind of: it aligns "error:" with "local":
error: remote 'refs/heads/master' is not an ancestor of
local 'refs/heads/master'.
Personal I think it would be better to align the right edges of
"remote" and "local" so that it looks like the following; this more
clearly shows the correspondence between the remote and local refs:
error: remote 'refs/heads/master' is not an ancestor of
local 'refs/heads/master'.
Or alternatively:
error: remote 'refs/heads/master' is not an ancestor of
local 'refs/heads/master'.
Cheers,
Wincent
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
