Merge branch 'sb/send-email-reconfirm-fix' into maint
* sb/send-email-reconfirm-fix: send-email: initial_to and initial_reply_to are both optionalmaint
						commit
						c13a5aca5d
					
				|  | @ -759,7 +759,8 @@ if (!defined $sender) { | ||||||
| } | } | ||||||
|  |  | ||||||
| if (!@initial_to && !defined $to_cmd) { | 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); | 		     valid_re => qr/\@.*\./, confirm_only => 1); | ||||||
| 	push @initial_to, parse_address_line($to) if defined $to; # sanitized/validated later | 	push @initial_to, parse_address_line($to) if defined $to; # sanitized/validated later | ||||||
| 	$prompting++; | 	$prompting++; | ||||||
|  | @ -786,7 +787,8 @@ sub expand_one_alias { | ||||||
|  |  | ||||||
| if ($thread && !defined $initial_reply_to && $prompting) { | if ($thread && !defined $initial_reply_to && $prompting) { | ||||||
| 	$initial_reply_to = ask( | 	$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); | 		valid_re => qr/\@.*\./, confirm_only => 1); | ||||||
| } | } | ||||||
| if (defined $initial_reply_to) { | if (defined $initial_reply_to) { | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	 Junio C Hamano
						Junio C Hamano