diff options
| -rwxr-xr-x | git-send-email.perl | 5 | ||||
| -rwxr-xr-x | t/t9001-send-email.sh | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index bfc6d4b45b..036e4b4259 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1252,10 +1252,9 @@ foreach my $t (@files) { if (defined $cc_cmd && !$suppress_cc{'cccmd'}) { open my $fh, "$cc_cmd \Q$t\E |" or die "(cc-cmd) Could not execute '$cc_cmd'"; - while(<$fh>) { - my $c = $_; + while(my $c = <$fh>) { + chomp $c; $c =~ s/^\s*//g; - $c =~ s/\n$//g; next if ($c eq $sender and $suppress_from); push @cc, $c; printf("(cc-cmd) Adding cc: %s from: '%s'\n", diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 6f67da4e71..99a16d5750 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -204,7 +204,7 @@ test_expect_success $PREREQ 'Prompting works' ' test_expect_success $PREREQ 'cccmd works' ' clean_fake_sendmail && cp $patches cccmd.patch && - echo cccmd--cccmd@example.com >>cccmd.patch && + echo "cccmd-- cccmd@example.com" >>cccmd.patch && { echo "#!$SHELL_PATH" echo sed -n -e s/^cccmd--//p \"\$1\" |