{"thread":{"id":"38981","subject":"[PATCH] send-pack: unify error messages for unsupported capabilities","startedAt":"2015-04-02T17:28:48Z","lastAt":"2015-04-02T18:02:01Z","messageCount":2,"participants":["Ralf Thielow","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"258868","messageId":"1427995728-8162-1-git-send-email-ralf.thielow@gmail.com","threadId":"38981","inReplyTo":null,"subject":"[PATCH] send-pack: unify error messages for unsupported capabilities","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2015-04-02T17:28:48Z","receivedAt":"2015-04-02T17:28:48Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"If --signed is not supported, the error message names the remote\n\"receiving end\". If --atomic is not supported, the error message\nnames the remote \"server\". Unify the naming to \"receiving end\"\nas we're in the context of \"push\".\n\nSigned-off-by: Ralf Thielow <ralf.thielow@gmail.com>\n---\n send-pack.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/send-pack.c b/send-pack.c\nindex 9d2b0c5..189bdde 100644\n--- a/send-pack.c\n+++ b/send-pack.c\n@@ -356,21 +356,21 @@ int send_pack(struct send_pack_args *args,\n \t\t\tdie(_(\"the receiving end does not support --signed push\"));\n \t\tpush_cert_nonce = xmemdupz(push_cert_nonce, len);\n \t}\n \n \tif (!remote_refs) {\n \t\tfprintf(stderr, \"No refs in common and none specified; doing nothing.\\n\"\n \t\t\t\"Perhaps you should specify a branch such as 'master'.\\n\");\n \t\treturn 0;\n \t}\n \tif (args->atomic && !atomic_supported)\n-\t\tdie(_(\"server does not support --atomic push\"));\n+\t\tdie(_(\"the receiving end does not support --atomic push\"));\n \n \tuse_atomic = atomic_supported && args->atomic;\n \n \tif (status_report)\n \t\tstrbuf_addstr(&cap_buf, \" report-status\");\n \tif (use_sideband)\n \t\tstrbuf_addstr(&cap_buf, \" side-band-64k\");\n \tif (quiet_supported && (args->quiet || !args->progress))\n \t\tstrbuf_addstr(&cap_buf, \" quiet\");\n \tif (use_atomic)\n-- \n2.4.0.rc0.243.g0be2dd7\n"},{"id":"258869","messageId":"xmqqtwwyjtnq.fsf@gitster.dls.corp.google.com","threadId":"38981","inReplyTo":"1427995728-8162-1-git-send-email-ralf.thielow@gmail.com","subject":"Re: [PATCH] send-pack: unify error messages for unsupported capabilities","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-04-02T18:02:01Z","receivedAt":"2015-04-02T18:02:01Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ralf Thielow <ralf.thielow@gmail.com> writes:\n\n> If --signed is not supported, the error message names the remote\n> \"receiving end\". If --atomic is not supported, the error message\n> names the remote \"server\". Unify the naming to \"receiving end\"\n> as we're in the context of \"push\".\n>\n> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>\n> ---\n\nSounds very sensible.  Let's do this before -rc1, so that i18n has\ntime to adjust.\n\n>  send-pack.c | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/send-pack.c b/send-pack.c\n> index 9d2b0c5..189bdde 100644\n> --- a/send-pack.c\n> +++ b/send-pack.c\n> @@ -356,21 +356,21 @@ int send_pack(struct send_pack_args *args,\n>  \t\t\tdie(_(\"the receiving end does not support --signed push\"));\n>  \t\tpush_cert_nonce = xmemdupz(push_cert_nonce, len);\n>  \t}\n>  \n>  \tif (!remote_refs) {\n>  \t\tfprintf(stderr, \"No refs in common and none specified; doing nothing.\\n\"\n>  \t\t\t\"Perhaps you should specify a branch such as 'master'.\\n\");\n>  \t\treturn 0;\n>  \t}\n>  \tif (args->atomic && !atomic_supported)\n> -\t\tdie(_(\"server does not support --atomic push\"));\n> +\t\tdie(_(\"the receiving end does not support --atomic push\"));\n>  \n>  \tuse_atomic = atomic_supported && args->atomic;\n>  \n>  \tif (status_report)\n>  \t\tstrbuf_addstr(&cap_buf, \" report-status\");\n>  \tif (use_sideband)\n>  \t\tstrbuf_addstr(&cap_buf, \" side-band-64k\");\n>  \tif (quiet_supported && (args->quiet || !args->progress))\n>  \t\tstrbuf_addstr(&cap_buf, \" quiet\");\n>  \tif (use_atomic)\n"}]}