# [PATCH] rebase-am: fix regression with new cover-letter config 5 messages from 2013-04-14 to 2013-04-15. Participants: Felipe Contreras, Junio C Hamano, Eric Sunshine. Thread: https://gitlist.dev/t/33511 ## Felipe Contreras, 2013-04-14 22:27 Subject: [PATCH] rebase-am: fix regression with new cover-letter config Message-ID: <1365978424-11841-1-git-send-email-felipe.contreras@gmail.com> URL: https://gitlist.dev/e/1365978424-11841-1-git-send-email-felipe.contreras%40gmail.com ``` If you have a cover-letter configuration set to anything other than 'false', 'git format-patch' might generate a cover letter, and 'git am' doesn't seem to like that. Ideally 'git am' should skip the cover-letter, but for now lets just fix the regression. Signed-off-by: Felipe Contreras --- git-rebase--am.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-rebase--am.sh b/git-rebase--am.sh index 97f31dc..f84854f 100644 --- a/git-rebase--am.sh +++ b/git-rebase--am.sh @@ -31,8 +31,8 @@ else rm -f "$GIT_DIR/rebased-patches" git format-patch -k --stdout --full-index --ignore-if-in-upstream \ - --src-prefix=a/ --dst-prefix=b/ \ - --no-renames $root_flag "$revisions" >"$GIT_DIR/rebased-patches" + --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \ + $root_flag "$revisions" >"$GIT_DIR/rebased-patches" ret=$? if test 0 != $ret -- 1.8.2.1.643.ge3cc75d ``` ## Junio C Hamano, 2013-04-15 01:48 Subject: Re: [PATCH] rebase-am: fix regression with new cover-letter config Message-ID: <7vhaj84l8m.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vhaj84l8m.fsf%40alter.siamese.dyndns.org In-Reply-To: <1365978424-11841-1-git-send-email-felipe.contreras@gmail.com> ``` Felipe Contreras writes: > If you have a cover-letter configuration set to anything other than > 'false', 'git format-patch' might generate a cover letter, and 'git am' > doesn't seem to like that. > > Ideally 'git am' should skip the cover-letter, but for now lets just fix > the regression. > > Signed-off-by: Felipe Contreras > --- This is a follow-up to the fc/send-email-annotate topic, right? You are mean to say "fix regression", which gave me a small heart attack ;-). I was worried if we had already merged it to 'next'. As I already wrote in the recent "What's cooking", the series looks good to me. I am inclined to say that we should merge it (together with this update) to 'next'. Thanks for catching this before breaking the real world users. > git-rebase--am.sh | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/git-rebase--am.sh b/git-rebase--am.sh > index 97f31dc..f84854f 100644 > --- a/git-rebase--am.sh > +++ b/git-rebase--am.sh > @@ -31,8 +31,8 @@ else > rm -f "$GIT_DIR/rebased-patches" > > git format-patch -k --stdout --full-index --ignore-if-in-upstream \ > - --src-prefix=a/ --dst-prefix=b/ \ > - --no-renames $root_flag "$revisions" >"$GIT_DIR/rebased-patches" > + --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \ > + $root_flag "$revisions" >"$GIT_DIR/rebased-patches" > ret=$? > > if test 0 != $ret ``` ## Felipe Contreras, 2013-04-15 02:31 Subject: Re: [PATCH] rebase-am: fix regression with new cover-letter config Message-ID: URL: https://gitlist.dev/e/CAMP44s0GbocoBrONYdiN6f%3Dqd58xbX0Y4neGSVRmCiLRr_f8Jw%40mail.gmail.com In-Reply-To: <7vhaj84l8m.fsf@alter.siamese.dyndns.org> ``` On Sun, Apr 14, 2013 at 8:48 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> If you have a cover-letter configuration set to anything other than >> 'false', 'git format-patch' might generate a cover letter, and 'git am' >> doesn't seem to like that. >> >> Ideally 'git am' should skip the cover-letter, but for now lets just fix >> the regression. >> >> Signed-off-by: Felipe Contreras >> --- > > This is a follow-up to the fc/send-email-annotate topic, right? Right. > You are mean to say "fix regression", which gave me a small heart > attack ;-). I was worried if we had already merged it to 'next'. > > As I already wrote in the recent "What's cooking", the series looks > good to me. I am inclined to say that we should merge it (together > with this update) to 'next'. Yeah, after thinking about it, it's not even really a regression, because people don't have format.coverletter=auto in their configs (yet), so the bug can't can possibly affect them. > Thanks for catching this before breaking the real world users. I'm running 'next' as you suggested we should do, along with all my patches, so that helps :) Cheers. -- Felipe Contreras ``` ## Junio C Hamano, 2013-04-15 02:51 Subject: Re: [PATCH] rebase-am: fix regression with new cover-letter config Message-ID: <7v1uac4icp.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v1uac4icp.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Felipe Contreras writes: >> You are mean to say "fix regression", which gave me a small heart >> attack ;-). I was worried if we had already merged it to 'next'. >> >> As I already wrote in the recent "What's cooking", the series looks >> good to me. I am inclined to say that we should merge it (together >> with this update) to 'next'. > > Yeah, after thinking about it, it's not even really a regression, > because people don't have format.coverletter=auto in their configs > (yet), so the bug can't can possibly affect them. Here is what I tentatively queued. rebase-am: explicitly disable cover-letter If the user has a cover-letter configuration set to anything other than 'false', 'git format-patch' may generate a cover letter, which has no place in "format-patch | am" pipeline. The internal invocatoin of format-patch must explicitly override the configuration from the command line, just like --src-prefix and other options already do. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano ``` ## Eric Sunshine, 2013-04-15 02:57 Subject: Re: [PATCH] rebase-am: fix regression with new cover-letter config Message-ID: URL: https://gitlist.dev/e/CAPig%2BcQXaZ_pdOn1RtANdQnYrOaRvpbS2kpCYDq1Gej1w5j%3DjQ%40mail.gmail.com In-Reply-To: <7v1uac4icp.fsf@alter.siamese.dyndns.org> ``` On Sun, Apr 14, 2013 at 10:51 PM, Junio C Hamano wrote: > Here is what I tentatively queued. > > rebase-am: explicitly disable cover-letter > > If the user has a cover-letter configuration set to anything > other than 'false', 'git format-patch' may generate a cover > letter, which has no place in "format-patch | am" pipeline. > > The internal invocatoin of format-patch must explicitly override s/invocatoin/invocation/ > the configuration from the command line, just like --src-prefix > and other options already do. > > Signed-off-by: Felipe Contreras > Signed-off-by: Junio C Hamano ```