From: Junio C Hamano Date: Mon, 22 Apr 2013 14:55:40 GMT Subject: Re: [PATCH 4/5] git-log.txt: rewrite note on why "--" may be required Message-ID: <7va9oqr4wj.fsf@alter.siamese.dyndns.org> In-Reply-To: <87vc7erjhc.fsf@linux-k42r.v.cablecom.net> Thomas Rast writes: > Thomas Rast writes: > >> -- >8 -- >> Subject: [PATCH] git-log(1): remove --full-line-diff description > > BTW, I generated this with your jc/format-patch, but it stopped working > after fc/send-email-annotate made it into next; I need this on top. Am > I missing something? No, the topic has been stalled and left behind and needs to be rebased on top of that other topic with your patch. Thanks. It also needs a lot more work to de-mime its output to be eligible for 'next', though. > -- >8 -- > Subject: [PATCH] FIXUP jc/format-patch: adapt for fc/send-email-annotate > > 2a4c260 (format-patch: add format.coverLetter configuration variable, > 2013-04-07) changed the coverletter variable to -1 by default, so the > die("... incompatible") always triggers. Test if it is >0 instead. > --- > builtin/log.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/builtin/log.c b/builtin/log.c > index 4804229..c972e62 100644 > --- a/builtin/log.c > +++ b/builtin/log.c > @@ -1247,7 +1247,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) > /* Set defaults and check incompatible options */ > if (rev.inline_single) { > use_stdout = 1; > - if (cover_letter) > + if (cover_letter > 0) > die(_("inline-single and cover-letter are incompatible.")); > if (thread) > die(_("inline-single and thread are incompatible."));