send-email: use Perl idioms in while loop
Change `while(<$fh>) { my $c = $_' to `while(my $c = <$fh>) {', and use `chomp $c' instead of `$c =~ s/\n$//g;', the two are equivalent in this case. I've also changed the --cccmd test so that we test for the stripping of whitespace at the beginning of the lines returned from the --cccmd. I think we probably shouldn't do this, but it was there already so I haven't changed the behavior. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.comReviewed-by: Avery Pennarun <apenwarr@gmail.com> Reviewed-by: Jeff King <peff@peff.net> > Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
529dd386dd
commit
41ae8f1d6c
@ -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",
|
||||
|
@ -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\"
|
||||
|
Loading…
Reference in New Issue
Block a user