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 bbf4deaa0d42ef2a843c2240000d7e34dfff0b62..435c7c9e26d75e8f6a4f635753f248fcf8106790 100755 (executable)
--- 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 {