summaryrefslogtreecommitdiff
path: root/builtin-diff.c
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2007-07-29 05:49:56 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-07-29 13:24:42 -0700
commit82cb8afa9bf24d2f77a6d565cdc08d6aa1febeb4 (patch)
tree1dce535b172dc2e73999bb2da2026a862847cfc1 /builtin-diff.c
parentRename git-rebase interactive buffer: todo => git-rebase-todo (diff)
downloadtgif-82cb8afa9bf24d2f77a6d565cdc08d6aa1febeb4.tar.xz
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 'builtin-diff.c')
-rw-r--r--builtin-diff.c1
1 files changed, 1 insertions, 0 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.