Re: [PATCH 4/4] Add a basic test case for git send-email, and fix some real bugs discovered.
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:28
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 4/4] Add a basic test case for git send-email, and fix some real bugs discovered. · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 4/4] Add a basic test case for git send-email, and fix some real bugs discovered. · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 4/4] Add a basic test case for git send-email, and fix some real bugs discovered. · Ryan Anderson <hidden>
- 2016-06-15 · Re: [PATCH 4/4] Add a basic test case for git send-email, and fix some real bugs discovered. · Alex Riesen <hidden>
- 2016-06-15 · Re: [PATCH 4/4] Add a basic test case for git send-email, and fix some real bugs discovered. · Christopher Faylor <hidden>
Junio C Hamano [off-list ref] writes:
quoted
64ea8c0210c2e9d1711a870460eca326778a4ffc t/t9001-send-email.sh | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) create mode 100755 t/t9001-send-email.shAdds test, alright, but I do not see the fix. Is this a thinko?
On top of yours, I think this covers the CC: trouble your test triggers. -- >8 - send-email: fix cc address fed to underlying sendmail ---
diff --git a/git-send-email.perl b/git-send-email.perl
index d418d6c..d61ef8e 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl@@ -448,9 +448,11 @@ foreach my $t (@files) { else { $author_not_sender = $2; } - printf("(mbox) Adding cc: %s from line '%s'\n", - $2, $_) unless $quiet; - push @cc, $2; + my $cc = extract_valid_address($2); + printf("(mbox) Adding cc: %s from ". + "line '%s'\n", + $cc, $_) unless $quiet; + push @cc, $cc; } } else {
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 276cbac..a61da1e 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh@@ -13,10 +13,14 @@ test_expect_success \ test_expect_success \ 'Setup helper tool' \ - 'echo "#!/bin/sh" > fake.sendmail - echo "shift" >> fake.sendmail - echo "echo \"\$*\" > commandline" >> fake.sendmail - echo "cat > msgtxt" >> fake.sendmail + '(echo "#!/bin/sh" + echo shift + echo for a + echo do + echo " echo \"!\$a!\"" + echo "done >commandline" + echo "cat > msgtxt" + ) >fake.sendmail chmod +x ./fake.sendmail git add fake.sendmail GIT_AUTHOR_NAME="A" git commit -a -m "Second."'
@@ -26,9 +30,12 @@ test_expect_success \ 'git format-patch -n HEAD^1 git send-email -from="Example <nobody@example.com>" --to=nobody@example.com --smtp-server="$(pwd)/fake.sendmail" ./0001*txt' +cat >expected <<\EOF +!nobody@example.com! +!author@example.com! +EOF test_expect_success \ 'Verify commandline' \ - 'cline=$(cat commandline) - [ "$cline" == "nobody@example.com author@example.com" ]' + 'diff commandline expected' test_done