Junio C Hamano 77d8c9107f Merge branches 'jc/diff-test' and 'th/diff' into next ...

* jc/diff-test:
  t4013: add "diff" UI program tests.

* th/diff:
  builtin-diff: turn recursive on when defaulting to --patch format.

2006-07-01 22:16:08 -07:00

..

diff.diff_--abbrev_initial..side

t4013: add "diff" UI program tests.

2006-07-01 22:02:17 -07:00

diff.diff_--patch-with-raw_-r_initial..side

t4013: add "diff" UI program tests.

2006-07-01 22:02:17 -07:00

diff.diff_--patch-with-raw_initial..side

t4013: add "diff" UI program tests.

2006-07-01 22:02:17 -07:00

diff.diff_--patch-with-stat_-r_initial..side

t4013: add "diff" UI program tests.

2006-07-01 22:02:17 -07:00

diff.diff_--patch-with-stat_initial..side

t4013: add "diff" UI program tests.

2006-07-01 22:02:17 -07:00

diff.diff_--stat_initial..side

t4013: add "diff" UI program tests.

2006-07-01 22:02:17 -07:00

diff.diff_-r_--stat_initial..side

t4013: add "diff" UI program tests.

2006-07-01 22:02:17 -07:00

diff.diff_-r_initial..side

t4013: add "diff" UI program tests.

2006-07-01 22:02:17 -07:00

diff.diff_initial..side

t4013: add "diff" UI program tests.

2006-07-01 22:02:17 -07:00

diff.diff-tree_--cc_--patch-with-stat_--summary_master

t4013 test updates for new output code.

2006-06-27 15:36:19 -07:00

diff.diff-tree_--cc_--patch-with-stat_--summary_side

t4013: add more tests around -c and --cc

2006-06-26 23:29:11 -07:00

diff.diff-tree_--cc_--patch-with-stat_master

t4013: note improvements brought by the new output code.

2006-06-29 12:07:27 -07:00

diff.diff-tree_--cc_--stat_--summary_master

t4013: add more tests around -c and --cc

2006-06-26 23:29:11 -07:00

diff.diff-tree_--cc_--stat_--summary_side

t4013: add more tests around -c and --cc

2006-06-26 23:29:11 -07:00

diff.diff-tree_--cc_--stat_master

t4013: add more tests around -c and --cc

2006-06-26 23:29:11 -07:00

diff.diff-tree_--cc_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--patch-with-raw_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--patch-with-stat_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty_--patch-with-raw_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty_--patch-with-stat_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty_--patch-with-stat_side

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty_--root_--patch-with-raw_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty_--root_--patch-with-stat_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty_--root_--stat_--summary_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty_--root_--stat_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty_--root_--summary_-r_initial

t4013: note improvements brought by the new output code.

2006-06-29 12:07:27 -07:00

diff.diff-tree_--pretty_--root_--summary_initial

t4013: note improvements brought by the new output code.

2006-06-29 12:07:27 -07:00

diff.diff-tree_--pretty_--root_-p_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty_--root_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty_--stat_--summary_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty_--stat_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty_--summary_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty_-p_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty_-p_side

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty_side

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty=oneline_--patch-with-raw_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty=oneline_--patch-with-stat_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty=oneline_--root_--patch-with-raw_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty=oneline_--root_--patch-with-stat_initial

t4013 test updates for new output code.

2006-06-27 15:36:19 -07:00

diff.diff-tree_--pretty=oneline_--root_-p_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty=oneline_--root_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty=oneline_-p_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--pretty=oneline_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--root_--abbrev_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--root_--patch-with-raw_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--root_--patch-with-stat_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--root_-p_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--root_-r_--abbrev_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--root_-r_--abbrev=4_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--root_-r_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_--root_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_-c_--abbrev_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_-c_--stat_--summary_master

t4013: add more tests around -c and --cc

2006-06-26 23:29:11 -07:00

diff.diff-tree_-c_--stat_--summary_side

t4013: add more tests around -c and --cc

2006-06-26 23:29:11 -07:00

diff.diff-tree_-c_--stat_master

t4013: add more tests around -c and --cc

2006-06-26 23:29:11 -07:00

diff.diff-tree_-c_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_-p_-m_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_-p_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_-p_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_-r_--abbrev_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_-r_--abbrev=4_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_-r_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.diff-tree_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.format-patch_--attach_--stdout_initial..master

t4013: add format-patch tests.

2006-06-29 00:28:30 -07:00

diff.format-patch_--attach_--stdout_initial..master^

t4013: add format-patch tests.

2006-06-29 00:28:30 -07:00

diff.format-patch_--attach_--stdout_initial..side

t4013: add format-patch tests.

2006-06-29 00:28:30 -07:00

diff.format-patch_--stdout_initial..master

t4013: add format-patch tests.

2006-06-29 00:28:30 -07:00

diff.format-patch_--stdout_initial..master^

t4013: add format-patch tests.

2006-06-29 00:28:30 -07:00

diff.format-patch_--stdout_initial..side

t4013: add format-patch tests.

2006-06-29 00:28:30 -07:00

diff.log_--patch-with-stat_--summary_master_--_dir_

t4013: add more tests around -c and --cc

2006-06-26 23:29:11 -07:00

diff.log_--patch-with-stat_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.log_--patch-with-stat_master_--_dir_

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.log_--root_--cc_--patch-with-stat_--summary_master

t4013 test updates for new output code.

2006-06-27 15:36:19 -07:00

diff.log_--root_--patch-with-stat_--summary_master

t4013: add more tests around -c and --cc

2006-06-26 23:29:11 -07:00

diff.log_--root_--patch-with-stat_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.log_--root_-c_--patch-with-stat_--summary_master

t4013 test updates for new output code.

2006-06-27 15:36:19 -07:00

diff.log_--root_-p_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.log_--root_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.log_-p_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.log_-SF_-p_master

t4013: add more tests around -c and --cc

2006-06-26 23:29:11 -07:00

diff.log_-SF_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.log_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.show_--patch-with-raw_side

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.show_--patch-with-stat_--summary_side

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.show_--patch-with-stat_side

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.show_--root_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.show_--stat_--summary_side

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.show_--stat_side

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.show_initial

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.show_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.show_side

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.whatchanged_--patch-with-stat_--summary_master_--_dir_

t4013: add more tests around -c and --cc

2006-06-26 23:29:11 -07:00

diff.whatchanged_--patch-with-stat_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.whatchanged_--patch-with-stat_master_--_dir_

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master

t4013 test updates for new output code.

2006-06-27 15:36:19 -07:00

diff.whatchanged_--root_--patch-with-stat_--summary_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.whatchanged_--root_--patch-with-stat_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.whatchanged_--root_-c_--patch-with-stat_--summary_master

t4013 test updates for new output code.

2006-06-27 15:36:19 -07:00

diff.whatchanged_--root_-p_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.whatchanged_--root_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.whatchanged_-p_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.whatchanged_-SF_-p_master

t4013: add more tests around -c and --cc

2006-06-26 23:29:11 -07:00

diff.whatchanged_-SF_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00

diff.whatchanged_master

t4013: add tests for diff/log family output options.

2006-06-26 14:36:40 -07:00