Merge branch 'sb/atomic-push'

gitster · gitster · commit 3c6151dad310 · 2015-04-02T12:34:43.000-07:00
* sb/atomic-push:
  send-pack: unify error messages for unsupported capabilities
diff --git a/send-pack.c b/send-pack.c
@@ -363,7 +363,7 @@ int send_pack(struct send_pack_args *args,
 		return 0;
 	}
 	if (args->atomic && !atomic_supported)
-		die(_("server does not support --atomic push"));
+		die(_("the receiving end does not support --atomic push"));
 
 	use_atomic = atomic_supported && args->atomic;
 

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ int send_pack(struct send_pack_args *args,`
`363`	`363`	`return 0;`
`364`	`364`	`}`
`365`	`365`	`if (args->atomic && !atomic_supported)`
`366`		`- die(_("server does not support --atomic push"));`
	`366`	`+ die(_("the receiving end does not support --atomic push"));`
`367`	`367`
`368`	`368`	`use_atomic = atomic_supported && args->atomic;`
`369`	`369`