Thread (10 messages) flat view 10 messages, 5 authors, 2016-06-15

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

From: Steffen Prohaska <hidden>
Date: 2016-06-15 22:43:46

On Nov 3, 2007, at 3:39 AM, J. Bruce Fields wrote:
quoted hunk ↗ jump to hunk
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help