From: Drew DeVault <sir@cmpwn.com>
To: git@vger.kernel.org, Stefan Beller <stefanbeller@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Cc: Drew DeVault <sir@cmpwn.com>
Subject: [PATCH 2/2] send-pack: downgrade push options error to warning
Date: Mon, 17 Feb 2020 09:44:32 -0500 [thread overview]
Message-ID: <20200217144432.43920-2-sir@cmpwn.com> (raw)
In-Reply-To: <20200217144432.43920-1-sir@cmpwn.com>
Because the receiving end has to explicitly enable
receive.advertisePushOptions, and many servers don't, it doesn't make
sense to set push options globally when half of your pushes are just
going to die.
Signed-off-by: Drew DeVault <sir@cmpwn.com>
---
send-pack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/send-pack.c b/send-pack.c
index 0407841ae8..8c81825e7d 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -439,7 +439,7 @@ int send_pack(struct send_pack_args *args,
use_atomic = atomic_supported && args->atomic;
if (args->push_options && !push_options_supported)
- die(_("the receiving end does not support push options"));
+ warning(_("the receiving end does not support push options"));
use_push_options = push_options_supported && args->push_options;
--
2.25.0
next prev parent reply other threads:[~2020-02-17 14:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-17 14:44 [PATCH 1/2] git-receive-pack: document push options Drew DeVault
2020-02-17 14:44 ` Drew DeVault [this message]
2020-02-18 5:40 ` [PATCH 2/2] send-pack: downgrade push options error to warning Jeff King
2020-02-18 17:44 ` Junio C Hamano
2020-02-18 5:30 ` [PATCH 1/2] git-receive-pack: document push options Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200217144432.43920-2-sir@cmpwn.com \
--to=sir@cmpwn.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=stefanbeller@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.
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).