Re: [PATCH] rebase-am: fix regression with new cover-letter config

2013-04-14 Thread Eric Sunshine
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

Re: [PATCH] rebase-am: fix regression with new cover-letter config

2013-04-14 Thread Junio C Hamano
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

Re: [PATCH] rebase-am: fix regression with new cover-letter config

2013-04-14 Thread Felipe Contreras
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 th

Re: [PATCH] rebase-am: fix regression with new cover-letter config

2013-04-14 Thread Junio C Hamano
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. > >

[PATCH] rebase-am: fix regression with new cover-letter config

2013-04-14 Thread Felipe Contreras
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