summaryrefslogtreecommitdiff
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-11-28 10:50:20 -0800
committerJunio C Hamano <gitster@pobox.com>2012-11-28 10:50:20 -0800
commit3b16b3702ac3da91cee3f74fdf8620289e0e8f14 (patch)
tree62e1a57a0e6f62db751e496bf4d1e1ea4710ea0d /git-send-email.perl
parent879ed7539357cf54e1c14f1c203eacd74469ff4c (diff)
parent8cac13dccbf78005f1579bf22dbac1bfe27e1572 (diff)
downloadgit-3b16b3702ac3da91cee3f74fdf8620289e0e8f14.tar.gz
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
Diffstat (limited to 'git-send-email.perl')
-rwxr-xr-xgit-send-email.perl7
1 files changed, 1 insertions, 6 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 => "",