From: Junio C Hamano Date: Thu, 2 Apr 2015 19:34:43 +0000 (-0700) Subject: Merge branch 'sb/atomic-push' X-Git-Tag: v2.4.0-rc1~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3c6151dad310db71f599dbfbac329fa961f29794?ds=inline;hp=-c Merge branch 'sb/atomic-push' * sb/atomic-push: send-pack: unify error messages for unsupported capabilities --- 3c6151dad310db71f599dbfbac329fa961f29794 diff --combined send-pack.c index 9d2b0c52ed,d938cba0a8..189bdde0c2 --- a/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;