Thomas Rast <trast@xxxxxxxxxxx> 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?
-- >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."));
--
1.8.2.1.844.g59e84de.dirty
--
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