mirror of
https://github.com/git/git.git
synced 2024-10-29 21:37:53 +01:00
Merge branch 'fc/send-email-no-sender-prompt'
* fc/send-email-no-sender-prompt: send-email: avoid questions when user has an ident
This commit is contained in:
commit
175bd3b0d0
2 changed files with 3 additions and 9 deletions
|
@ -753,16 +753,11 @@ sub file_declares_8bit_cte {
|
|||
}
|
||||
}
|
||||
|
||||
my $prompting = 0;
|
||||
if (!defined $sender) {
|
||||
$sender = $repoauthor || $repocommitter || '';
|
||||
$sender = ask("Who should the emails appear to be from? [$sender] ",
|
||||
default => $sender,
|
||||
valid_re => qr/\@.*\./, confirm_only => 1);
|
||||
print "Emails will be sent from: ", $sender, "\n";
|
||||
$prompting++;
|
||||
}
|
||||
|
||||
my $prompting = 0;
|
||||
if (!@initial_to && !defined $to_cmd) {
|
||||
my $to = ask("Who should the emails be sent to (if any)? ",
|
||||
default => "",
|
||||
|
|
|
@ -191,14 +191,13 @@ test_expect_success $PREREQ 'Show all headers' '
|
|||
|
||||
test_expect_success $PREREQ 'Prompting works' '
|
||||
clean_fake_sendmail &&
|
||||
(echo "Example <from@example.com>"
|
||||
echo "to@example.com"
|
||||
(echo "to@example.com"
|
||||
echo ""
|
||||
) | GIT_SEND_EMAIL_NOTTY=1 git send-email \
|
||||
--smtp-server="$(pwd)/fake.sendmail" \
|
||||
$patches \
|
||||
2>errors &&
|
||||
grep "^From: Example <from@example.com>\$" msgtxt1 &&
|
||||
grep "^From: A U Thor <author@example.com>\$" msgtxt1 &&
|
||||
grep "^To: to@example.com\$" msgtxt1
|
||||
'
|
||||
|
||||
|
|
Loading…
Reference in a new issue