From: Junio C Hamano <junkio@cox.net>
Date: Thu, 29 Jun 2006 07:18:52 +0000 (-0700)
Subject: format-patch: fix diff format option implementation
X-Git-Tag: v1.4.2-rc1~85^2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=27e1b127f32640bea68b84e0ff57d640fd31cc92;p=git.git

format-patch: fix diff format option implementation

The updates forgot to make the diff go recursive.
---

diff --git a/builtin-log.c b/builtin-log.c
index debddb97a..bcd4e5e16 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -179,7 +179,8 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
 	rev.diff = 1;
 	rev.combine_merges = 0;
 	rev.ignore_merges = 1;
-	rev.diffopt.msg_sep = "---\n";
+	rev.diffopt.msg_sep = "";
+	rev.diffopt.recursive = 1;
 
 	git_config(git_format_config);
 	rev.extra_headers = extra_headers;