On Sun, Apr 14, 2013 at 8:48 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Felipe Contreras <felipe.contreras@xxxxxxxxx> 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 <felipe.contreras@xxxxxxxxx> >> --- > > 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html