diff options
| -rw-r--r-- | builtin-diff.c | 1 | ||||
| -rwxr-xr-x | t/t9300-fast-import.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/builtin-diff.c b/builtin-diff.c index 7f367b6b9..b48121e6e 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 4b920be33..6f95305bf 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 <input && - git diff --raw L^ L >output && + git diff-tree --abbrev --raw L^ L >output && git diff expect output' ### |