From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Mar 2018 22:54:02 +0000 (-0800)
Subject: Merge branch 'xz/send-email-batch-size'
X-Git-Tag: v2.17.0-rc0~47
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2cd91ec1970bd89e6b4b79b5aa41f27435625e71?hp=c1a7902f9adda4c3a64de99d565cf9982f12b1d9

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
---

diff --git a/git-send-email.perl b/git-send-email.perl
index bbf4deaa0d..435c7c9e26 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -379,6 +379,10 @@ sub signal_handler {
 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 {