diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-11-28 10:50:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-28 10:50:20 -0800 |
| commit | 3b16b3702ac3da91cee3f74fdf8620289e0e8f14 (patch) | |
| tree | 62e1a57a0e6f62db751e496bf4d1e1ea4710ea0d | |
| parent | t: add tests for "git var" (diff) | |
| parent | send-email: avoid questions when user has an ident (diff) | |
| download | tgif-3b16b3702ac3da91cee3f74fdf8620289e0e8f14.tar.xz | |
Merge branch 'fc/send-email-no-sender-prompt' into jk/send-email-sender-prompt
* fc/send-email-no-sender-prompt:
send-email: avoid questions when user has an ident
| -rwxr-xr-x | git-send-email.perl | 7 | ||||
| -rwxr-xr-x | t/t9001-send-email.sh | 5 |
2 files changed, 3 insertions, 9 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index 5a7c29db93..aca0225e56 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -753,16 +753,11 @@ 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++; } +my $prompting = 0; if (!@initial_to && !defined $to_cmd) { my $to = ask("Who should the emails be sent to (if any)? ", default => "", diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 6c6af7d13f..c5d66cf386 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -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 ' |