Merge branch 'js/diff'

* js/diff: Turn on recursive with --summary
2006-10-18 22:09:03 -07:00 · 2006-10-18 22:09:03 -07:00 · 65606f3530
commit 65606f3530
parent 2dcd3ce8d3 d7014dc081
2 changed files with 2 additions and 1 deletions
--- a/diff.c
+++ b/diff.c
@ -1760,6 +1760,7 @@ int diff_setup_done(struct diff_options *options)
 	if (options->output_format & (DIFF_FORMAT_PATCH |
 				      DIFF_FORMAT_NUMSTAT |
 				      DIFF_FORMAT_DIFFSTAT |
+				      DIFF_FORMAT_SUMMARY |
 				      DIFF_FORMAT_CHECKDIFF))
 		options->recursive = 1;
 	/*
--- 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
 $