From 047fbe906b375e8a3a7564ad0e4443f62dd528a2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 1 Jul 2006 22:15:40 -0700 Subject: [PATCH] builtin-diff: turn recursive on when defaulting to --patch format. Signed-off-by: Junio C Hamano --- builtin-diff.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/builtin-diff.c b/builtin-diff.c index 47e0a37e21..d520c7ca29 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -254,8 +254,10 @@ int cmd_diff(int argc, const char **argv, char **envp) init_revisions(&rev); argc = setup_revisions(argc, argv, &rev, NULL); - if (!rev.diffopt.output_format) + if (!rev.diffopt.output_format) { rev.diffopt.output_format = DIFF_FORMAT_PATCH; + diff_setup_done(&rev.diffopt); + } /* Do we have --cached and not have a pending object, then * default to HEAD by hand. Eek. -- 2.11.4.GIT