summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2007-07-29 09:49:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-29 20:24:42 (GMT)
commit82cb8afa9bf24d2f77a6d565cdc08d6aa1febeb4 (patch)
tree1dce535b172dc2e73999bb2da2026a862847cfc1 /t
parentc22486c9677682416ae6ad3ee77688e8b6923ee3 (diff)
downloadgit-82cb8afa9bf24d2f77a6d565cdc08d6aa1febeb4.zip
git-82cb8afa9bf24d2f77a6d565cdc08d6aa1febeb4.tar.gz
git-82cb8afa9bf24d2f77a6d565cdc08d6aa1febeb4.tar.bz2
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>
Diffstat (limited to 't')
-rwxr-xr-xt/t9300-fast-import.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 4b920be..6f95305 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'
###