{"thread":{"id":"19835","subject":"[PATCH resend] Test cccmd in t9001-send-email.sh and fix two bugs","startedAt":"2009-06-17T07:17:42Z","lastAt":"2009-06-19T10:06:04Z","messageCount":5,"participants":["Paolo Bonzini","Markus Heidelberg","Jay Soffian"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"116455","messageId":"1245223062-27132-1-git-send-email-bonzini@gnu.org","threadId":"19835","inReplyTo":null,"subject":"[PATCH resend] Test cccmd in t9001-send-email.sh and fix two bugs","fromName":"Paolo Bonzini","fromEmail":"bonzini@gnu.org","sentAt":"2009-06-17T07:17:42Z","receivedAt":"2009-06-17T07:17:42Z","isPatch":true,"sender":{"key":"bonzini@gnu.org","avatar":"https://avatars.githubusercontent.com/u/42082?v=4"},"body":"For another patch series I'm working on I needed some tests\nfor the cc-cmd feature of git-send-email.\n\nThis patch adds 3 tests for the feature, and fixes two bugs.\nThe first bug is that the --suppress-cc option for `cccmd' was\nmisspelled as `ccmd' in the code. The second bug, which is\nactually found only with my other series, is that the argument\nto the cccmd is never quoted, so the cccmd would fail with\npatch file names containing a space.\n\nI also test the possibility to specify --suppress-cc\nmultiple times.\n\nSigned-Off-By: Paolo Bonzini \n---\n git-send-email.perl | 4 +-\n t/t9001-send-email.sh | 80 +++++++++++++++++++++++++++++++++++++++++++++---\n 2 files changed, 77 insertions(+), 7 deletions(-)\n\n\tThe patch was sent first a week ago with no remarks.\n\ndiff --git a/git-send-email.perl b/git-send-email.perl\nindex 303e03a..7ae1f29 100755\n--- a/git-send-email.perl\n+++ b/git-send-email.perl\n@@ -334,7 +334,7 @@ if (@suppress_cc) {\n }\n \n if ($suppress_cc{'all'}) {\n-\tforeach my $entry (qw (ccmd cc author self sob body bodycc)) {\n+\tforeach my $entry (qw (cccmd cc author self sob body bodyccc)) {\n \t\t$suppress_cc{$entry} = 1;\n \t}\n \tdelete $suppress_cc{'all'};\n@@ -1104,7 +1104,7 @@ foreach my $t (@files) {\n \tclose F;\n \n \tif (defined $cc_cmd && !$suppress_cc{'cccmd'}) {\n-\t\topen(F, \"$cc_cmd $t |\")\n+\t\topen(F, \"$cc_cmd \\Q$t\\E |\")\n \t\t\tor die \"(cc-cmd) Could not execute '$cc_cmd'\";\n \t\twhile() {\n \t\t\tmy $c = $_;\ndiff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh\nindex 9ce04fd..fb7d9f3 100755\n--- a/t/t9001-send-email.sh\n+++ b/t/t9001-send-email.sh\n@@ -148,6 +148,22 @@ test_expect_success 'Prompting works' '\n \t\tgrep \"^To: to@example.com$\" msgtxt1\n '\n \n+test_expect_success 'cccmd works' '\n+\tclean_fake_sendmail &&\n+\tcp $patches cccmd.patch &&\n+\techo cccmd--cccmd@example.com >>cccmd.patch &&\n+\techo sed -n s/^cccmd--//p \\\"\\$1\\\" > cccmd-sed &&\n+\tchmod +x cccmd-sed &&\n+\tgit send-email \\\n+\t\t--from=\"Example \" \\\n+\t\t--to=nobody@example.com \\\n+\t\t--cc-cmd=./cccmd-sed \\\n+\t\t--smtp-server=\"$(pwd)/fake.sendmail\" \\\n+\t\tcccmd.patch \\\n+\t\t&&\n+\tgrep ^Cc:.*cccmd@example.com msgtxt1\n+'\n+\n z8=zzzzzzzz\n z64=$z8$z8$z8$z8$z8$z8$z8$z8\n z512=$z64$z64$z64$z64$z64$z64$z64$z64\n@@ -274,7 +290,7 @@ EOF\n test_suppression () {\n \tgit send-email \\\n \t\t--dry-run \\\n-\t\t--suppress-cc=$1 \\\n+\t\t--suppress-cc=$1 ${2+\"--suppress-cc=$2\"} \\\n \t\t--from=\"Example \" \\\n \t\t--to=to@example.com \\\n \t\t--smtp-server relay.example.com \\\n@@ -282,8 +298,8 @@ test_suppression () {\n \tsed\t-e \"s/^\\(Date:\\).*/\\1 DATE-STRING/\" \\\n \t\t-e \"s/^\\(Message-Id:\\).*/\\1 MESSAGE-ID-STRING/\" \\\n \t\t-e \"s/^\\(X-Mailer:\\).*/\\1 X-MAILER-STRING/\" \\\n-\t\t>actual-suppress-$1 &&\n-\ttest_cmp expected-suppress-$1 actual-suppress-$1\n+\t\t>actual-suppress-$1${2+\"-$2\"} &&\n+\ttest_cmp expected-suppress-$1${2+\"-$2\"} actual-suppress-$1${2+\"-$2\"}\n }\n \n test_expect_success 'sendemail.cc set' '\n@@ -316,6 +332,34 @@ test_expect_success 'sendemail.cc unset' '\n \ttest_suppression sob\n '\n \n+cat >expected-suppress-cccmd <<\\EOF\n+0001-Second.patch\n+(mbox) Adding cc: A from line 'From: A '\n+(mbox) Adding cc: One from line 'Cc: One , two@example.com'\n+(mbox) Adding cc: two@example.com from line 'Cc: One , two@example.com'\n+(body) Adding cc: C O Mitter from line 'Signed-off-by: C O Mitter '\n+Dry-OK. Log says:\n+Server: relay.example.com\n+MAIL FROM:\n+RCPT TO:,,,,\n+From: Example \n+To: to@example.com\n+Cc: A , One , two@example.com, C O Mitter \n+Subject: [PATCH 1/1] Second.\n+Date: DATE-STRING\n+Message-Id: MESSAGE-ID-STRING\n+X-Mailer: X-MAILER-STRING\n+\n+Result: OK\n+EOF\n+\n+test_expect_success 'sendemail.cccmd' '\n+\techo echo cc-cmd@example.com > cccmd &&\n+\tchmod +x cccmd &&\n+\tgit config sendemail.cccmd ./cccmd &&\n+\ttest_suppression cccmd\n+'\n+\n cat >expected-suppress-all <<\\EOF\n 0001-Second.patch\n Dry-OK. Log says:\n@@ -341,13 +385,14 @@ cat >expected-suppress-body <<\\EOF\n (mbox) Adding cc: A from line 'From: A '\n (mbox) Adding cc: One from line 'Cc: One , two@example.com'\n (mbox) Adding cc: two@example.com from line 'Cc: One , two@example.com'\n+(cc-cmd) Adding cc: cc-cmd@example.com from: './cccmd'\n Dry-OK. Log says:\n Server: relay.example.com\n MAIL FROM:\n-RCPT TO:,,,\n+RCPT TO:,,,,\n From: Example \n To: to@example.com\n-Cc: A , One , two@example.com\n+Cc: A , One , two@example.com, cc-cmd@example.com\n Subject: [PATCH 1/1] Second.\n Date: DATE-STRING\n Message-Id: MESSAGE-ID-STRING\n@@ -360,6 +405,30 @@ test_expect_success '--suppress-cc=body' '\n \ttest_suppression body\n '\n \n+cat >expected-suppress-body-cccmd <<\\EOF\n+0001-Second.patch\n+(mbox) Adding cc: A from line 'From: A '\n+(mbox) Adding cc: One from line 'Cc: One , two@example.com'\n+(mbox) Adding cc: two@example.com from line 'Cc: One , two@example.com'\n+Dry-OK. Log says:\n+Server: relay.example.com\n+MAIL FROM:\n+RCPT TO:,,,\n+From: Example \n+To: to@example.com\n+Cc: A , One , two@example.com\n+Subject: [PATCH 1/1] Second.\n+Date: DATE-STRING\n+Message-Id: MESSAGE-ID-STRING\n+X-Mailer: X-MAILER-STRING\n+\n+Result: OK\n+EOF\n+\n+test_expect_success '--suppress-cc=body --suppress-cc=cccmd' '\n+\ttest_suppression body cccmd\n+'\n+\n cat >expected-suppress-sob <<\\EOF\n 0001-Second.patch\n (mbox) Adding cc: A from line 'From: A '\n@@ -381,6 +450,7 @@ Result: OK\n EOF\n \n test_expect_success '--suppress-cc=sob' '\n+\tgit config --unset sendemail.cccmd\n \ttest_suppression sob\n '\n \n-- \n1.6.0.3\n"},{"id":"116555","messageId":"200906181211.39440.markus.heidelberg@web.de","threadId":"19835","inReplyTo":"1245223062-27132-1-git-send-email-bonzini@gnu.org","subject":"Re: [PATCH resend] Test cccmd in t9001-send-email.sh and fix two bugs","fromName":"Markus Heidelberg","fromEmail":"markus.heidelberg@web.de","sentAt":"2009-06-18T10:11:39Z","receivedAt":"2009-06-18T10:11:39Z","isPatch":true,"sender":{"key":"markus.heidelberg@web.de","avatar":"https://avatars.githubusercontent.com/u/6334512?v=4"},"body":"Paolo Bonzini, 17.06.2009:\n> The first bug is that the --suppress-cc option for `cccmd' was\n> misspelled as `ccmd' in the code.\n\n> +++ b/git-send-email.perl\n> @@ -334,7 +334,7 @@ if (@suppress_cc) {\n> }\n> \n> if ($suppress_cc{'all'}) {\n> -\tforeach my $entry (qw (ccmd cc author self sob body bodycc)) {\n> +\tforeach my $entry (qw (cccmd cc author self sob body bodyccc)) {\n\nAdditionally you incorrectly changed bodycc to bodyccc.\n\nThen I noticed that the documentation mentions ccbody, but the code uses\nbodycc.\nThe author seemed to intend using bodycc, since it is also used in the\ntests and the commit message (3531e2703d, send-email: --suppress-cc\nimprovements, 2009-02-15), but besides the documentation, ccbody is used\nin the bash completion.\n\n> \t\t$suppress_cc{$entry} = 1;\n> \t}\n> \tdelete $suppress_cc{'all'};\n"},{"id":"116562","messageId":"1245328292-25280-1-git-send-email-bonzini@gnu.org","threadId":"19835","inReplyTo":"200906181211.39440.markus.heidelberg@web.de","subject":"[PATCH v2] Test cccmd in t9001-send-email.sh and fix some bugs","fromName":"Paolo Bonzini","fromEmail":"bonzini@gnu.org","sentAt":"2009-06-18T12:31:32Z","receivedAt":"2009-06-18T12:31:32Z","isPatch":true,"sender":{"key":"bonzini@gnu.org","avatar":"https://avatars.githubusercontent.com/u/42082?v=4"},"body":"For another patch series I'm working on I needed some tests\nfor the cc-cmd feature of git-send-email.\n\nThis patch adds 3 tests for the feature and for the possibility\nto specify --suppress-cc multiple times, and fixes two bugs.\nThe first bug is that the --suppress-cc option for `cccmd' was\nmisspelled as `ccmd' in the code. The second bug, which is\nactually found only with my other series, is that the argument\nto the cccmd is never quoted, so the cccmd would fail with\npatch file names containing a space.\n\nA third bug I fix (in the docs) is that the bodycc argument was\nactually spelled ccbody in the documentation and bash completion.\n\nSigned-off-by: Paolo Bonzini \nCc: Markus Heidelberg \n---\n Documentation/git-send-email.txt | 4 +-\n contrib/completion/git-completion.bash | 2 +-\n git-send-email.perl | 4 +-\n t/t9001-send-email.sh | 80 ++++++++++++++++++++++++++++++--\n 4 files changed, 80 insertions(+), 10 deletions(-)\n\n\tThanks Markus for noticing my erroneous change and\n\tthe inconsistency in the docs.\n\ndiff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt\nindex 9902da4..fbde2d3 100644\n--- a/Documentation/git-send-email.txt\n+++ b/Documentation/git-send-email.txt\n@@ -193,12 +193,12 @@ Automating\n - 'self' will avoid including the sender\n - 'cc' will avoid including anyone mentioned in Cc lines in the patch header\n except for self (use 'self' for that).\n-- 'ccbody' will avoid including anyone mentioned in Cc lines in the\n+- 'bodycc' will avoid including anyone mentioned in Cc lines in the\n patch body (commit message) except for self (use 'self' for that).\n - 'sob' will avoid including anyone mentioned in Signed-off-by lines except\n for self (use 'self' for that).\n - 'cccmd' will avoid running the --cc-cmd.\n-- 'body' is equivalent to 'sob' + 'ccbody'\n+- 'body' is equivalent to 'sob' + 'bodycc'\n - 'all' will suppress all auto cc values.\n --\n +\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 80ab4e4..b60cb68 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1299,7 +1299,7 @@ _git_rebase ()\n }\n \n __git_send_email_confirm_options=\"always never auto cc compose\"\n-__git_send_email_suppresscc_options=\"author self cc ccbody sob cccmd body all\"\n+__git_send_email_suppresscc_options=\"author self cc bodycc sob cccmd body all\"\n \n _git_send_email ()\n {\ndiff --git a/git-send-email.perl b/git-send-email.perl\nindex 303e03a..8ce6f1f 100755\n--- a/git-send-email.perl\n+++ b/git-send-email.perl\n@@ -334,7 +334,7 @@ if (@suppress_cc) {\n }\n \n if ($suppress_cc{'all'}) {\n-\tforeach my $entry (qw (ccmd cc author self sob body bodycc)) {\n+\tforeach my $entry (qw (cccmd cc author self sob body bodycc)) {\n \t\t$suppress_cc{$entry} = 1;\n \t}\n \tdelete $suppress_cc{'all'};\n@@ -1104,7 +1104,7 @@ foreach my $t (@files) {\n \tclose F;\n \n \tif (defined $cc_cmd && !$suppress_cc{'cccmd'}) {\n-\t\topen(F, \"$cc_cmd $t |\")\n+\t\topen(F, \"$cc_cmd \\Q$t\\E |\")\n \t\t\tor die \"(cc-cmd) Could not execute '$cc_cmd'\";\n \t\twhile() {\n \t\t\tmy $c = $_;\ndiff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh\nindex 9ce04fd..fb7d9f3 100755\n--- a/t/t9001-send-email.sh\n+++ b/t/t9001-send-email.sh\n@@ -148,6 +148,22 @@ test_expect_success 'Prompting works' '\n \t\tgrep \"^To: to@example.com$\" msgtxt1\n '\n \n+test_expect_success 'cccmd works' '\n+\tclean_fake_sendmail &&\n+\tcp $patches cccmd.patch &&\n+\techo cccmd--cccmd@example.com >>cccmd.patch &&\n+\techo sed -n s/^cccmd--//p \\\"\\$1\\\" > cccmd-sed &&\n+\tchmod +x cccmd-sed &&\n+\tgit send-email \\\n+\t\t--from=\"Example \" \\\n+\t\t--to=nobody@example.com \\\n+\t\t--cc-cmd=./cccmd-sed \\\n+\t\t--smtp-server=\"$(pwd)/fake.sendmail\" \\\n+\t\tcccmd.patch \\\n+\t\t&&\n+\tgrep ^Cc:.*cccmd@example.com msgtxt1\n+'\n+\n z8=zzzzzzzz\n z64=$z8$z8$z8$z8$z8$z8$z8$z8\n z512=$z64$z64$z64$z64$z64$z64$z64$z64\n@@ -274,7 +290,7 @@ EOF\n test_suppression () {\n \tgit send-email \\\n \t\t--dry-run \\\n-\t\t--suppress-cc=$1 \\\n+\t\t--suppress-cc=$1 ${2+\"--suppress-cc=$2\"} \\\n \t\t--from=\"Example \" \\\n \t\t--to=to@example.com \\\n \t\t--smtp-server relay.example.com \\\n@@ -282,8 +298,8 @@ test_suppression () {\n \tsed\t-e \"s/^\\(Date:\\).*/\\1 DATE-STRING/\" \\\n \t\t-e \"s/^\\(Message-Id:\\).*/\\1 MESSAGE-ID-STRING/\" \\\n \t\t-e \"s/^\\(X-Mailer:\\).*/\\1 X-MAILER-STRING/\" \\\n-\t\t>actual-suppress-$1 &&\n-\ttest_cmp expected-suppress-$1 actual-suppress-$1\n+\t\t>actual-suppress-$1${2+\"-$2\"} &&\n+\ttest_cmp expected-suppress-$1${2+\"-$2\"} actual-suppress-$1${2+\"-$2\"}\n }\n \n test_expect_success 'sendemail.cc set' '\n@@ -316,6 +332,34 @@ test_expect_success 'sendemail.cc unset' '\n \ttest_suppression sob\n '\n \n+cat >expected-suppress-cccmd <<\\EOF\n+0001-Second.patch\n+(mbox) Adding cc: A from line 'From: A '\n+(mbox) Adding cc: One from line 'Cc: One , two@example.com'\n+(mbox) Adding cc: two@example.com from line 'Cc: One , two@example.com'\n+(body) Adding cc: C O Mitter from line 'Signed-off-by: C O Mitter '\n+Dry-OK. Log says:\n+Server: relay.example.com\n+MAIL FROM:\n+RCPT TO:,,,,\n+From: Example \n+To: to@example.com\n+Cc: A , One , two@example.com, C O Mitter \n+Subject: [PATCH 1/1] Second.\n+Date: DATE-STRING\n+Message-Id: MESSAGE-ID-STRING\n+X-Mailer: X-MAILER-STRING\n+\n+Result: OK\n+EOF\n+\n+test_expect_success 'sendemail.cccmd' '\n+\techo echo cc-cmd@example.com > cccmd &&\n+\tchmod +x cccmd &&\n+\tgit config sendemail.cccmd ./cccmd &&\n+\ttest_suppression cccmd\n+'\n+\n cat >expected-suppress-all <<\\EOF\n 0001-Second.patch\n Dry-OK. Log says:\n@@ -341,13 +385,14 @@ cat >expected-suppress-body <<\\EOF\n (mbox) Adding cc: A from line 'From: A '\n (mbox) Adding cc: One from line 'Cc: One , two@example.com'\n (mbox) Adding cc: two@example.com from line 'Cc: One , two@example.com'\n+(cc-cmd) Adding cc: cc-cmd@example.com from: './cccmd'\n Dry-OK. Log says:\n Server: relay.example.com\n MAIL FROM:\n-RCPT TO:,,,\n+RCPT TO:,,,,\n From: Example \n To: to@example.com\n-Cc: A , One , two@example.com\n+Cc: A , One , two@example.com, cc-cmd@example.com\n Subject: [PATCH 1/1] Second.\n Date: DATE-STRING\n Message-Id: MESSAGE-ID-STRING\n@@ -360,6 +405,30 @@ test_expect_success '--suppress-cc=body' '\n \ttest_suppression body\n '\n \n+cat >expected-suppress-body-cccmd <<\\EOF\n+0001-Second.patch\n+(mbox) Adding cc: A from line 'From: A '\n+(mbox) Adding cc: One from line 'Cc: One , two@example.com'\n+(mbox) Adding cc: two@example.com from line 'Cc: One , two@example.com'\n+Dry-OK. Log says:\n+Server: relay.example.com\n+MAIL FROM:\n+RCPT TO:,,,\n+From: Example \n+To: to@example.com\n+Cc: A , One , two@example.com\n+Subject: [PATCH 1/1] Second.\n+Date: DATE-STRING\n+Message-Id: MESSAGE-ID-STRING\n+X-Mailer: X-MAILER-STRING\n+\n+Result: OK\n+EOF\n+\n+test_expect_success '--suppress-cc=body --suppress-cc=cccmd' '\n+\ttest_suppression body cccmd\n+'\n+\n cat >expected-suppress-sob <<\\EOF\n 0001-Second.patch\n (mbox) Adding cc: A from line 'From: A '\n@@ -381,6 +450,7 @@ Result: OK\n EOF\n \n test_expect_success '--suppress-cc=sob' '\n+\tgit config --unset sendemail.cccmd\n \ttest_suppression sob\n '\n \n-- \n1.6.0.3\n"},{"id":"116564","messageId":"76718490906180549mb65dc17va513c294038470d2@mail.gmail.com","threadId":"19835","inReplyTo":"200906181211.39440.markus.heidelberg@web.de","subject":"Re: [PATCH resend] Test cccmd in t9001-send-email.sh and fix two bugs","fromName":"Jay Soffian","fromEmail":"jaysoffian@gmail.com","sentAt":"2009-06-18T12:49:50Z","receivedAt":"2009-06-18T12:49:50Z","isPatch":true,"sender":{"key":"jaysoffian@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155970?v=4"},"body":"On Thu, Jun 18, 2009 at 6:11 AM, Markus\nHeidelberg wrote:\n> Paolo Bonzini, 17.06.2009:\n>> The first bug is that the --suppress-cc option for `cccmd' was\n>> misspelled as `ccmd' in the code.\n\nGood catch. That error has actually existed since --suppress-cc was\nintroduced in 65648283. But nor did I (sheesh, aren't many eyes\nsupposed to make all bugs shallow?) catch it in 3531e2703d.\n\n> Then I noticed that the documentation mentions ccbody, but the code uses\n> bodycc.\n> The author seemed to intend using bodycc, since it is also used in the\n> tests and the commit message (3531e2703d, send-email: --suppress-cc\n> improvements, 2009-02-15), but besides the documentation, ccbody is used\n> in the bash completion.\n\nWow, I'm pretty sure I intended bodycc. And I'm not even dyslexic.\n\nThanks,\n\nj.\n"},{"id":"116621","messageId":"200906191206.05286.markus.heidelberg@web.de","threadId":"19835","inReplyTo":"1245328292-25280-1-git-send-email-bonzini@gnu.org","subject":"Re: [PATCH v2] Test cccmd in t9001-send-email.sh and fix some bugs","fromName":"Markus Heidelberg","fromEmail":"markus.heidelberg@web.de","sentAt":"2009-06-19T10:06:04Z","receivedAt":"2009-06-19T10:06:04Z","isPatch":true,"sender":{"key":"markus.heidelberg@web.de","avatar":"https://avatars.githubusercontent.com/u/6334512?v=4"},"body":"Paolo Bonzini, 18.06.2009:\n> For another patch series I'm working on I needed some tests\n> for the cc-cmd feature of git-send-email.\n\nI think this is text for a cover-letter.\n\n> This patch adds 3 tests for the feature and for the possibility\n> to specify --suppress-cc multiple times, and fixes two bugs.\n> The first bug is that the --suppress-cc option for `cccmd' was\n> misspelled as `ccmd' in the code. The second bug, which is\n> actually found only with my other series, is that the argument\n> to the cccmd is never quoted, so the cccmd would fail with\n> patch file names containing a space.\n> \n> A third bug I fix (in the docs) is that the bodycc argument was\n> actually spelled ccbody in the documentation and bash completion.\n\nAnd these three unrelated bug fixes should rather go into three separate\npatches.\n\n> Signed-off-by: Paolo Bonzini \n> Cc: Markus Heidelberg \n> ---\n> Documentation/git-send-email.txt | 4 +-\n> contrib/completion/git-completion.bash | 2 +-\n> git-send-email.perl | 4 +-\n> t/t9001-send-email.sh | 80 ++++++++++++++++++++++++++++++--\n> 4 files changed, 80 insertions(+), 10 deletions(-)\n> \n> \tThanks Markus for noticing my erroneous change and\n> \tthe inconsistency in the docs.\n\nThis normally goes directly under ---\nI didn't notice it before the second look.\n"}]}