Merge branch 'jc/maint-format-patch' into maint

* jc/maint-format-patch:
  format-patch: show patch text for the root commit

1 files changed, 7 insertions, 0 deletions

diff --git a/builtin-log.c b/builtin-log.c
index 99d1137b08..4420b4fd4f 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -944,6 +944,13 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 		 * get_revision() to do the usual traversal.
 		 */
 	}
+
+	/*
+	 * We cannot move this anywhere earlier because we do want to
+	 * know if --root was given explicitly from the comand line.
+	 */
+	rev.show_root_diff = 1;
+
 	if (cover_letter) {
 		/* remember the range */
 		int i;