From 82cb8afa9bf24d2f77a6d565cdc08d6aa1febeb4 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sun, 29 Jul 2007 05:49:56 -0400 Subject: [PATCH] git-diff: turn on recursion by default The tree recursion behavior of git-diff may appear inconsistent to the user because it depends on the format of the patch as well as whether one is diffing between trees or against the index. Since git-diff is a porcelain wrapper for low-level diff commands, it makes sense for its behavior to be consistent no matter what is being diffed. This patch turns on recursion in all cases. Signed-off-by: Junio C Hamano --- builtin-diff.c | 1 + t/t9300-fast-import.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin-diff.c b/builtin-diff.c index 7f367b6b9d..b48121e6e2 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -233,6 +233,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix) die("diff_setup_done failed"); } rev.diffopt.allow_external = 1; + rev.diffopt.recursive = 1; /* Do we have --cached and not have a pending object, then * default to HEAD by hand. Eek. diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 4b920be331..6f95305bf4 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -577,7 +577,7 @@ EXPECT_END test_expect_success \ 'L: verify internal tree sorting' \ 'git-fast-import output && + git diff-tree --abbrev --raw L^ L >output && git diff expect output' ### -- 2.11.4.GIT