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

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

diff --git a/builtin-log.c b/builtin-log.c
index 99d1137b081d2e14d75e3d4d1766c3bf921f1493..4420b4fd4f871d1284b90e80fa58fbe529b61592 100644 (file)
--- 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;