diff options
| author | Jeff King <peff@peff.net> | 2007-07-29 13:49:56 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-30 00:24:42 +0400 |
| commit | 82cb8afa9bf24d2f77a6d565cdc08d6aa1febeb4 (patch) | |
| tree | 1dce535b172dc2e73999bb2da2026a862847cfc1 | |
| parent | c22486c9677682416ae6ad3ee77688e8b6923ee3 (diff) | |
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 <gitster@pobox.com>
| -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 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 <input && - git diff --raw L^ L >output && + git diff-tree --abbrev --raw L^ L >output && git diff expect output' ### |