summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-03-06 22:54:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-06 22:54:02 (GMT)
commit2cd91ec1970bd89e6b4b79b5aa41f27435625e71 (patch)
tree14efa476abc83f0ddb84352f298e5211b0718327
parentc1a7902f9adda4c3a64de99d565cf9982f12b1d9 (diff)
parent9caa70697b3b85eb11caaa5b5fd506baccfb0bac (diff)
downloadgit-2cd91ec1970bd89e6b4b79b5aa41f27435625e71.zip
git-2cd91ec1970bd89e6b4b79b5aa41f27435625e71.tar.gz
git-2cd91ec1970bd89e6b4b79b5aa41f27435625e71.tar.bz2
Merge branch 'xz/send-email-batch-size'
"git send-email" learned to complain when the batch-size option is not defined when the relogin-delay option is, since these two are mutually required. * xz/send-email-batch-size: send-email: error out when relogin delay is missing
-rwxr-xr-xgit-send-email.perl4
1 files changed, 4 insertions, 0 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index bbf4dea..435c7c9 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -379,6 +379,10 @@ unless ($rc) {
die __("Cannot run git format-patch from outside a repository\n")
if $format_patch and not $repo;
+die __("`batch-size` and `relogin` must be specified together " .
+ "(via command-line or configuration option)\n")
+ if defined $relogin_delay and not defined $batch_size;
+
# Now, let's fill any that aren't set in with defaults:
sub read_config {