From 84788b0ad520f8ccb85c0aebc0f12136e3c26ee7 Mon Sep 17 00:00:00 2001 From: Smylers Date: Thu, 5 Sep 2013 09:07:23 +0100 Subject: [PATCH] Multiple commits in 1 attachment in Patch Guide In the Super Quick Patch Guide, if a change involves multiple commits, put them all in a single perlbug attachment. Father Chrysostomos says it's easier like this, in a comment on RT #119599. It simplifies the instructions, and avoiding the need to mention mail clients. --- pod/perlhack.pod | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/pod/perlhack.pod b/pod/perlhack.pod index 94fd963..ff685d2 100644 --- a/pod/perlhack.pod +++ b/pod/perlhack.pod @@ -63,8 +63,8 @@ sentence. For example, "Fixed spelling errors in perlhack.pod". The next step is to submit your patch to the Perl core ticket system via email. -Assuming your patch consists of a single git commit, the following -writes the file as a MIME attachment, and sends it with a meaningful +If your changes are in a single git commit, run the following commands +to write the file as a MIME attachment and send it with a meaningful subject: % git format-patch -1 --attach @@ -75,25 +75,14 @@ The perlbug program will ask you a few questions about your email address and the patch you're submitting. Once you've answered them it will submit your patch via email. -If your changes are in multiple commits, generate a patch for each of -them: +If your changes are in multiple commits, generate a patch file +containing them all, and attach that: - % git format-patch origin/blead --attach + % git format-patch origin/blead --attach --stdout > patches + % ./perl -Ilib utils/perlbug -f patches -Run perlbug without any attachments: - - % ./perl -Ilib utils/perlbug - -Follow the prompts, picking a subject that summarizes your changes -overall and has "[PATCH]" at the beginning. Describe your changes in the -editor window that opens. Instead of sending the report, press 'f' to -save the message to a file, then quit. - -Now create an email using the headers and body from the -perlbug-generated file, and attach your patches. If you use Mutt, this -command will do that: - - % mutt -H perlbug.rep -a *.patch +When prompted, pick a subject that summarizes your changes overall and +has "[PATCH]" at the beginning. =item * Thank you -- 2.7.4