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
This commit is contained in:
Junio C Hamano 2018-03-06 14:54:02 -08:00
Родитель c1a7902f9a 9caa70697b
Коммит 2cd91ec197
1 изменённых файлов: 4 добавлений и 0 удалений

Просмотреть файл

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