Browse Source

send-email: ask_default should apply to all emails, not just the first

Commit 6e18251 made the "Send this email?" prompt assume yes if confirm
= "inform" when it was unable to get a valid response. However, the
"yes" assumption only worked correctly for the first email. This commit
fixes the issue and confirms the fix by modifying the existing test for
the prompt to send multiple emails.

Reported by Matthieu Moy <Matthieu.Moy@imag.fr>

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jay Soffian 16 years ago committed by Junio C Hamano
parent
commit
dc1460aa8d
  1. 3
      git-send-email.perl
  2. 4
      t/t9001-send-email.sh

3
git-send-email.perl

@ -687,7 +687,7 @@ if ($compose && $compose > 0) { @@ -687,7 +687,7 @@ if ($compose && $compose > 0) {

# Variables we set as part of the loop over files
our ($message_id, %mail, $subject, $reply_to, $references, $message,
$needs_confirm, $message_num);
$needs_confirm, $message_num, $ask_default);

sub extract_valid_address {
my $address = shift;
@ -845,7 +845,6 @@ X-Mailer: git-send-email $gitversion @@ -845,7 +845,6 @@ X-Mailer: git-send-email $gitversion

if ($needs_confirm && !$dry_run) {
print "\n$header\n";
my $ask_default;
if ($needs_confirm eq "inform") {
$confirm_unconfigured = 0; # squelch this message for the rest of this run
$ask_default = "y"; # assume yes on EOF since user hasn't explicitly asked for confirmation

4
t/t9001-send-email.sh

@ -462,12 +462,14 @@ test_expect_success 'confirm by default (due to --compose)' ' @@ -462,12 +462,14 @@ test_expect_success 'confirm by default (due to --compose)' '
test_expect_success 'confirm detects EOF (inform assumes y)' '
CONFIRM=$(git config --get sendemail.confirm) &&
git config --unset sendemail.confirm &&
rm -fr outdir &&
git format-patch -2 -o outdir &&
GIT_SEND_EMAIL_NOTTY=1 \
git send-email \
--from="Example <nobody@example.com>" \
--to=nobody@example.com \
--smtp-server="$(pwd)/fake.sendmail" \
$patches < /dev/null
outdir/*.patch < /dev/null
ret="$?"
git config sendemail.confirm ${CONFIRM:-never}
test $ret = "0"

Loading…
Cancel
Save