On Mon, Nov 26, 2012 at 09:08:34AM -0800, Junio C Hamano wrote:
> Krzysztof Mazur <krzysiek@xxxxxxxxxxxx> writes:
>
> > In some cases the user may want to send email with "Cc:" line with
> > email address we cannot extract. Now we allow user to extract
> > such email address for us.
> >
> > Signed-off-by: Krzysztof Mazur <krzysiek@xxxxxxxxxxxx>
> > ---
> > git-send-email.perl | 9 ++++++---
> > 1 file changed, 6 insertions(+), 3 deletions(-)
> >
> > diff --git a/git-send-email.perl b/git-send-email.perl
> > index d42dca2..9996735 100755
> > --- a/git-send-email.perl
> > +++ b/git-send-email.perl
> > @@ -851,10 +851,10 @@ sub extract_valid_address_or_die {
> >
> > sub validate_address {
> > my $address = shift;
> > - if (!extract_valid_address($address)) {
> > + while (!extract_valid_address($address)) {
> > print STDERR "error: unable to extract a valid address from: $address\n";
> > - $_ = ask("What to do with this address? ([q]uit|[d]rop): ",
> > - valid_re => qr/^(?:quit|q|drop|d)/i,
> > + $_ = ask("What to do with this address? ([q]uit|[d]rop|[e]dit): ",
> > + valid_re => qr/^(?:quit|q|drop|d|edit|e)/i,
> > default => 'q');
> > if (/^d/i) {
> > return undef;
> > @@ -862,6 +862,9 @@ sub validate_address {
> > cleanup_compose_files();
> > exit(0);
> > }
> > + $address = ask("Who should the email be sent to (if any)? ",
> > + default => "",
> > + valid_re => qr/\@.*\./, confirm_only => 1);
>
> Not having this new code inside "elsif (/^e/) { }" feels somewhat
> sloppy, even though it is not *too* bad. Also do we know this
ok, I will fix that.
> function will never be used for addresses other than recipients' (I
> gave a cursory look to see what is done to the $sender and it does
> not seem to go through this function, tho)?
Yes, this function is called only from validate_address_just()
to filter @initial_to, @initial_cc, @bcc_list as early as possible,
and filter @to and @cc added in each email.
Krzysiek
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html