[PATCH 16/16] send-email: use Perl idioms in while loop
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Sep 30, 2010, 13:43 UTC
- Message-ID
- <1285854189-10240-17-git-send-email-avarab@gmail.com>
- In-Reply-To
- <1285854189-10240-1-git-send-email-avarab@gmail.com>
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.com> --- git-send-email.perl | 5 ++--- 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 5a19d3d..445d2ec 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 6f67da4..99a16d5 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\"
-- 1.7.3.159.g610493