summaryrefslogtreecommitdiff
path: root/send-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-04-02 19:34:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-04-02 19:34:43 (GMT)
commit3c6151dad310db71f599dbfbac329fa961f29794 (patch)
tree0ee09af08ab3a485aeb9629250eaa8d6401d0b9b /send-pack.c
parentcf8a8c6bd53c43e29cb735eb7934ffc996475d77 (diff)
parentc8b8f22aa97a94dbad4fb7d8dcb2c5bf21c4fa32 (diff)
downloadgit-3c6151dad310db71f599dbfbac329fa961f29794.zip
git-3c6151dad310db71f599dbfbac329fa961f29794.tar.gz
git-3c6151dad310db71f599dbfbac329fa961f29794.tar.bz2
Merge branch 'sb/atomic-push'
* sb/atomic-push: send-pack: unify error messages for unsupported capabilities
Diffstat (limited to 'send-pack.c')
-rw-r--r--send-pack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/send-pack.c b/send-pack.c
index 9d2b0c5..189bdde 100644
--- 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;