From: Ralf Thielow <ralf.thielow@gmail.com>
To: git@vger.kernel.org
Cc: matthias.ruester@gmail.com, Ralf Thielow <ralf.thielow@gmail.com>
Subject: [PATCH] send-pack: unify error messages for unsupported capabilities
Date: Thu, 2 Apr 2015 19:28:48 +0200 [thread overview]
Message-ID: <1427995728-8162-1-git-send-email-ralf.thielow@gmail.com> (raw)
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
next reply other threads:[~2015-04-02 17:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-02 17:28 Ralf Thielow [this message]
2015-04-02 18:02 ` [PATCH] send-pack: unify error messages for unsupported capabilities Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1427995728-8162-1-git-send-email-ralf.thielow@gmail.com \
--to=ralf.thielow@gmail.com \
--cc=git@vger.kernel.org \
--cc=matthias.ruester@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox