Merge branch 'sb/atomic-push'

* sb/atomic-push:
send-pack: unify error messages for unsupported capabilities

diff --combined send-pack.c
index 9d2b0c52ed8235425795772db99fc14ea9c2bf2b,d938cba0a8ebc6c463dd64fafff3cafafef4d2b7..189bdde0c29b1aa62c9628786fa7b8c1b4083fb3
--- 1/send-pack.c
--- 2/send-pack.c
+++ b/send-pack.c
@@@ -47,7 -47,6 +47,7 @@@ static int pack_objects(int fd, struct 
                NULL,
                NULL,
                NULL,
 +              NULL,
        };
        struct child_process po = CHILD_PROCESS_INIT;
        int i;
@@@ -61,8 -60,6 +61,8 @@@
                argv[i++] = "-q";
        if (args->progress)
                argv[i++] = "--progress";
 +      if (is_repository_shallow())
 +              argv[i++] = "--shallow";
        po.argv = argv;
        po.in = -1;
        po.out = args->stateless_rpc ? -1 : fd;
@@@ -363,7 -360,7 +363,7 @@@ int send_pack(struct send_pack_args *ar
                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;