From e7769b3e04bf5711ca4eb233093190c024e6644d Mon Sep 17 00:00:00 2001 From: "Craig A. Berry" Date: Fri, 17 Jan 2014 21:46:08 -0600 Subject: [PATCH] Mention perlbug -p in perlhack. Using git's --attach with perlbug -f actually mangled the patches, making them harder to apply, but now we have a better way to do it. --- pod/perlhack.pod | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pod/perlhack.pod b/pod/perlhack.pod index 47f6b36..dc3f396 100644 --- a/pod/perlhack.pod +++ b/pod/perlhack.pod @@ -64,25 +64,23 @@ The next step is to submit your patch to the Perl core ticket system via email. 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: +to generate the patch file and attach it to your bug report: - % git format-patch -1 --attach - % ./perl -Ilib utils/perlbug -s "[PATCH] $( - git log -1 --oneline HEAD)" -f 0001-*.patch + % git format-patch -1 + % ./perl -Ilib utils/perlbug -p 0001-*.patch 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 file -containing them all, and attach that: +If your changes are in multiple commits, generate a patch file for each +one and provide them to perlbug's C<-p> option separated by commas: - % git format-patch origin/blead --attach --stdout > patches - % ./perl -Ilib utils/perlbug -f patches + % git format-patch -3 + % ./perl -Ilib utils/perlbug -p 0001-fix1.patch,0002-fix2.patch,\ + > 0003-fix3.patch -When prompted, pick a subject that summarizes your changes overall and -has "[PATCH]" at the beginning. +When prompted, pick a subject that summarizes your changes. =item * Thank you -- 2.7.4