t3418: non-interactive rebase --continue with rerere enabled

diff --git a/git-send-email.perl b/git-send-email.perl
index 76bb499fbbb3d99b9d5a6a378586c31bce838db2..ae9f8698c5a4842c2c0d63db51dde067ddeeb1c9 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -492,8 +492,10 @@ sub parse_sendmail_alias {
        local $_ = shift;
        if (/"/) {
                print STDERR "warning: sendmail alias with quotes is not supported: $_\n";
-       } elsif (/^\s|\\$/) {
-               print STDERR "warning: sendmail continuation line is not supported: $_\n";
+       } elsif (/:include:/) {
+               print STDERR "warning: `:include:` not supported: $_\n";
+       } elsif (/[\/|]/) {
+               print STDERR "warning: `/file` or `|pipe` redirection not supported: $_\n";
        } elsif (/^(\S+?)\s*:\s*(.+)$/) {
                my ($alias, $addr) = ($1, $2);
                $aliases{$alias} = [ split_addrs($addr) ];
@@ -504,10 +506,16 @@ sub parse_sendmail_alias {
 
 sub parse_sendmail_aliases {
        my $fh = shift;
+       my $s = '';
        while (<$fh>) {
-               if (/^\s*(?:#.*)?$/) { next; }
-               parse_sendmail_alias($_);
+               chomp;
+               next if /^\s*$/ || /^\s*#/;
+               $s .= $_, next if $s =~ s/\\$// || s/^\s+//;
+               parse_sendmail_alias($s) if $s;
+               $s = $_;
        }
+       $s =~ s/\\$//; # silently tolerate stray '\' on last line
+       parse_sendmail_alias($s) if $s;
 }
 
 my %parse_alias = (