diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2010-09-30 13:43:09 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-30 12:20:33 -0700 |
| commit | 41ae8f1d6cf70f32328c984cdbe51d0f156cd501 (patch) | |
| tree | f97db962830780cbd84bab82d54144d5dc7e5c64 | |
| parent | 529dd386dda6c6e6d0dad801785d2d943756fb3f (diff) | |
| download | git-41ae8f1d6cf70f32328c984cdbe51d0f156cd501.tar.gz | |
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>
| -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\" |