aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-10-03 23:09:56 +0200
committerJunio C Hamano <junkio@cox.net>2006-10-05 15:10:40 -0700
commitd7014dc0811eb24f418830a30dacc203c1a580f4 (patch)
tree507c7ecec9c532fad6aed2e82af67c448a9dcca1 /diff.c
parent51a7c66a73ce74fad3b7b05109ed6ce013202fa5 (diff)
downloadgit-d7014dc0811eb24f418830a30dacc203c1a580f4.tar.gz
git-d7014dc0811eb24f418830a30dacc203c1a580f4.tar.xz
Turn on recursive with --summary
This makes "git log/diff --summary" imply recursive behaviour, whose effect is summarized in one test output: --- a/t/t4013/diff.diff-tree_--pretty_--root_--summary_initial +++ b/t/t4013/diff.diff-tree_--pretty_--root_--summary_initial @@ -5,7 +5,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000 Initial - create mode 040000 dir + create mode 100644 dir/sub create mode 100644 file0 create mode 100644 file2 $ When a file is created in a subdirectory, we used to say just the directory name only when that directory also was created, which did not make sense from two reasons. It is not any more significant to create a new file in a new directory than to create a new file in an existing directory, and even if it were, reportinging the new directory name without saying the actual filename is not useful. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index fb8243261..9dbbed75b 100644
--- a/diff.c
+++ b/diff.c
@@ -1741,6 +1741,7 @@ int diff_setup_done(struct diff_options *options)
*/
if (options->output_format & (DIFF_FORMAT_PATCH |
DIFF_FORMAT_DIFFSTAT |
+ DIFF_FORMAT_SUMMARY |
DIFF_FORMAT_CHECKDIFF))
options->recursive = 1;
/*