diff options
| author | Stefan Beller <sbeller@google.com> | 2018-02-12 11:44:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-12 12:43:03 -0800 |
| commit | 9caa70697b3b85eb11caaa5b5fd506baccfb0bac (patch) | |
| tree | ff6267dbd25ce76fdd039f0302d9b61a8dc261b7 | |
| parent | 5453b83bdf92efbfe9e9aaa54d4c62ce48ced2f5 (diff) | |
| download | git-xz/send-email-batch-size.tar.gz | |
send-email: error out when relogin delay is missingxz/send-email-batch-size
When the batch size is neither configured nor given on the command
line, but the relogin delay is given, then the current code ignores
the relogin delay setting.
This is unsafe as there was some intention when setting the batch size.
One workaround would be to just assume a batch size of 1 as a default.
This however may be bad UX, as then the user may wonder why it is sending
slowly without apparent batching.
Error out for now instead of potentially confusing the user.
As 5453b83bdf (send-email: --batch-size to work around some SMTP
server limit, 2017-05-21) lays out, we rather want to not have this
interface anyway and would rather want to react on the server throttling
dynamically.
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-send-email.perl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index 8a1ee0f0d4..5bd689958e 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -378,6 +378,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 { |