Merge branch 'sb/atomic-push'
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Apr 2015 19:34:43 +0000 (12:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Apr 2015 19:34:43 +0000 (12:34 -0700)
* sb/atomic-push:
send-pack: unify error messages for unsupported capabilities

send-pack.c
index 9d2b0c52ed8235425795772db99fc14ea9c2bf2b..189bdde0c29b1aa62c9628786fa7b8c1b4083fb3 100644 (file)
@@ -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;