diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-09-14 21:32:07 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-09-14 21:32:07 -0700 |
commit | c13a5aca5da4e94e69d5432aeeafd123221c79e3 (patch) | |
tree | 847acd750a371aff661903863f42848681cfeffe | |
parent | 448e3700a0eb5acff5e52882b7941e0cfee6c5f3 (diff) | |
parent | 618374930ab0de78c3994a633ca5f26e286810cf (diff) | |
download | git-c13a5aca5da4e94e69d5432aeeafd123221c79e3.tar.gz git-c13a5aca5da4e94e69d5432aeeafd123221c79e3.tar.xz |
Merge branch 'sb/send-email-reconfirm-fix' into maint
* sb/send-email-reconfirm-fix:
send-email: initial_to and initial_reply_to are both optional
-rwxr-xr-x | git-send-email.perl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index 607137b9a..aea66a0d4 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -759,7 +759,8 @@ if (!defined $sender) { } if (!@initial_to && !defined $to_cmd) { - my $to = ask("Who should the emails be sent to? ", + my $to = ask("Who should the emails be sent to (if any)? ", + default => "", valid_re => qr/\@.*\./, confirm_only => 1); push @initial_to, parse_address_line($to) if defined $to; # sanitized/validated later $prompting++; @@ -786,7 +787,8 @@ sub expand_one_alias { if ($thread && !defined $initial_reply_to && $prompting) { $initial_reply_to = ask( - "Message-ID to be used as In-Reply-To for the first email? ", + "Message-ID to be used as In-Reply-To for the first email (if any)? ", + default => "", valid_re => qr/\@.*\./, confirm_only => 1); } if (defined $initial_reply_to) { |