If git-send-email is configured with sendemail.from, we will not prompt the user for the "From" address of the emails. If it is not configured, we prompt the user, but provide the repo author or committer as a default. Even though we probably have a sensible value for the default, the prompt is a safety check in case git generated an incorrect implicit ident string.
Now that Git.pm will tell us whether the ident is implicit or explicit, we can stop prompting in the explicit case, saving most users from having to see the prompt at all. Signed-off-by: Jeff King <[email protected]> --- git-send-email.perl | 22 +++++++++++++--------- t/t9001-send-email.sh | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 47 insertions(+), 11 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 5a7c29d..0c49b32 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -436,9 +436,8 @@ if (0) { } } -my ($repoauthor, $repocommitter); -($repoauthor) = Git::ident_person(@repo, 'author'); -($repocommitter) = Git::ident_person(@repo, 'committer'); +my ($repoauthor, $author_explicit) = Git::ident_person(@repo, 'author'); +my ($repocommitter, $committer_explicit) = Git::ident_person(@repo, 'committer'); # Verify the user input @@ -755,12 +754,17 @@ if (!$force) { 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++; + ($sender, my $explicit) = + defined $repoauthor ? ($repoauthor, $author_explicit) : + defined $repocommitter ? ($repocommitter, $committer_explicit) : + ('', 0); + if (!$explicit) { + $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++; + } } if (!@initial_to && !defined $to_cmd) { diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 6c6af7d..0fe0b8e 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -191,15 +191,47 @@ test_expect_success $PREREQ 'Show all headers' ' test_expect_success $PREREQ 'Prompting works' ' clean_fake_sendmail && - (echo "Example <[email protected]>" - echo "[email protected]" + (echo "[email protected]" echo "" ) | GIT_SEND_EMAIL_NOTTY=1 git send-email \ --smtp-server="$(pwd)/fake.sendmail" \ $patches \ 2>errors && + grep "^From: A U Thor <[email protected]>\$" msgtxt1 && + grep "^To: [email protected]\$" msgtxt1 +' + +test_expect_success $PREREQ,AUTOIDENT 'implicit ident prompts for sender' ' + clean_fake_sendmail && + (echo "Example <[email protected]>" && + echo "[email protected]" && + echo "" + ) | + (sane_unset GIT_AUTHOR_NAME && + sane_unset GIT_AUTHOR_EMAIL && + sane_unset GIT_COMMITTER_NAME && + sane_unset GIT_COMMITTER_EMAIL && + GIT_SEND_EMAIL_NOTTY=1 git send-email \ + --smtp-server="$(pwd)/fake.sendmail" \ + $patches \ + 2>errors && grep "^From: Example <[email protected]>\$" msgtxt1 && grep "^To: [email protected]\$" msgtxt1 + ) +' + +test_expect_success $PREREQ,!AUTOIDENT 'broken implicit ident aborts send-email' ' + clean_fake_sendmail && + (sane_unset GIT_AUTHOR_NAME && + sane_unset GIT_AUTHOR_EMAIL && + sane_unset GIT_COMMITTER_NAME && + sane_unset GIT_COMMITTER_EMAIL && + GIT_SEND_EMAIL_NOTTY=1 && export GIT_SEND_EMAIL_NOTTY && + test_must_fail git send-email \ + --smtp-server="$(pwd)/fake.sendmail" \ + $patches </dev/null 2>errors.out && + test_i18ngrep "tell me who you are" errors.out + ) ' test_expect_success $PREREQ 'tocmd works' ' -- 1.8.0.207.gdf2154c -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
