* [PATCH] send-pack: unify error messages for unsupported capabilities
@ 2015-04-02 17:28 Ralf Thielow
2015-04-02 18:02 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Ralf Thielow @ 2015-04-02 17:28 UTC (permalink / raw
To: git; +Cc: matthias.ruester, Ralf Thielow
If --signed is not supported, the error message names the remote
"receiving end". If --atomic is not supported, the error message
names the remote "server". Unify the naming to "receiving end"
as we're in the context of "push".
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---
send-pack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/send-pack.c b/send-pack.c
index 9d2b0c5..189bdde 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -356,21 +356,21 @@ int send_pack(struct send_pack_args *args,
die(_("the receiving end does not support --signed push"));
push_cert_nonce = xmemdupz(push_cert_nonce, len);
}
if (!remote_refs) {
fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
"Perhaps you should specify a branch such as 'master'.\n");
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;
if (status_report)
strbuf_addstr(&cap_buf, " report-status");
if (use_sideband)
strbuf_addstr(&cap_buf, " side-band-64k");
if (quiet_supported && (args->quiet || !args->progress))
strbuf_addstr(&cap_buf, " quiet");
if (use_atomic)
--
2.4.0.rc0.243.g0be2dd7
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] send-pack: unify error messages for unsupported capabilities
2015-04-02 17:28 [PATCH] send-pack: unify error messages for unsupported capabilities Ralf Thielow
@ 2015-04-02 18:02 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2015-04-02 18:02 UTC (permalink / raw
To: Ralf Thielow; +Cc: git, matthias.ruester
Ralf Thielow <ralf.thielow@gmail.com> writes:
> If --signed is not supported, the error message names the remote
> "receiving end". If --atomic is not supported, the error message
> names the remote "server". Unify the naming to "receiving end"
> as we're in the context of "push".
>
> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
> ---
Sounds very sensible. Let's do this before -rc1, so that i18n has
time to adjust.
> send-pack.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/send-pack.c b/send-pack.c
> index 9d2b0c5..189bdde 100644
> --- a/send-pack.c
> +++ b/send-pack.c
> @@ -356,21 +356,21 @@ int send_pack(struct send_pack_args *args,
> die(_("the receiving end does not support --signed push"));
> push_cert_nonce = xmemdupz(push_cert_nonce, len);
> }
>
> if (!remote_refs) {
> fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
> "Perhaps you should specify a branch such as 'master'.\n");
> 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;
>
> if (status_report)
> strbuf_addstr(&cap_buf, " report-status");
> if (use_sideband)
> strbuf_addstr(&cap_buf, " side-band-64k");
> if (quiet_supported && (args->quiet || !args->progress))
> strbuf_addstr(&cap_buf, " quiet");
> if (use_atomic)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-04-02 18:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-02 17:28 [PATCH] send-pack: unify error messages for unsupported capabilities Ralf Thielow
2015-04-02 18:02 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).