From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 18 Jan 2009 07:05:50 +0000 (-0800)
Subject: Merge branch 'jc/maint-format-patch'
X-Git-Tag: v1.6.2-rc0~138
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cd1dbd37d950f6592d3b84dc95c3863657c3aa7c?hp=33256e6b1bfb597f6505a7f40554097035c9ab60

Merge branch 'jc/maint-format-patch'

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

diff --git a/builtin-log.c b/builtin-log.c
index c1e2c6a4c5..c7aa48e748 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -936,6 +936,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;