diff options
Diffstat (limited to 'third_party/git/t/t4013')
179 files changed, 0 insertions, 6996 deletions
diff --git a/third_party/git/t/t4013/diff.config_format.subjectprefix_DIFFERENT_PREFIX b/third_party/git/t/t4013/diff.config_format.subjectprefix_DIFFERENT_PREFIX deleted file mode 100644 index 78f8970e2b..0000000000 --- a/third_party/git/t/t4013/diff.config_format.subjectprefix_DIFFERENT_PREFIX +++ /dev/null @@ -1,2 +0,0 @@ -$ git config format.subjectprefix DIFFERENT_PREFIX -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master b/third_party/git/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master deleted file mode 100644 index 9951e3677d..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master +++ /dev/null @@ -1,34 +0,0 @@ -$ git diff-tree --cc --patch-with-stat --summary master -59d314ad6f356dd08601a4cd5e530381da3e3c64 - dir/sub | 2 ++ - file0 | 3 +++ - 2 files changed, 5 insertions(+) - -diff --cc dir/sub -index cead32e,7289e35..992913c ---- a/dir/sub -+++ b/dir/sub -@@@ -1,6 -1,4 +1,8 @@@ - A - B - +C - +D - +E - +F -+ 1 -+ 2 -diff --cc file0 -index b414108,f4615da..10a8a9f ---- a/file0 -+++ b/file0 -@@@ -1,6 -1,6 +1,9 @@@ - 1 - 2 - 3 - +4 - +5 - +6 -+ A -+ B -+ C -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_side b/third_party/git/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_side deleted file mode 100644 index cec33fa3f0..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_side +++ /dev/null @@ -1,39 +0,0 @@ -$ git diff-tree --cc --patch-with-stat --summary side -c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master b/third_party/git/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master deleted file mode 100644 index db3c0a7b2c..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master +++ /dev/null @@ -1,34 +0,0 @@ -$ git diff-tree --cc --patch-with-stat master -59d314ad6f356dd08601a4cd5e530381da3e3c64 - dir/sub | 2 ++ - file0 | 3 +++ - 2 files changed, 5 insertions(+) - -diff --cc dir/sub -index cead32e,7289e35..992913c ---- a/dir/sub -+++ b/dir/sub -@@@ -1,6 -1,4 +1,8 @@@ - A - B - +C - +D - +E - +F -+ 1 -+ 2 -diff --cc file0 -index b414108,f4615da..10a8a9f ---- a/file0 -+++ b/file0 -@@@ -1,6 -1,6 +1,9 @@@ - 1 - 2 - 3 - +4 - +5 - +6 -+ A -+ B -+ C -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--cc_--shortstat_master b/third_party/git/t/t4013/diff.diff-tree_--cc_--shortstat_master deleted file mode 100644 index a4ca42df2a..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--cc_--shortstat_master +++ /dev/null @@ -1,4 +0,0 @@ -$ git diff-tree --cc --shortstat master -59d314ad6f356dd08601a4cd5e530381da3e3c64 - 2 files changed, 5 insertions(+) -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--cc_--stat_--summary_master b/third_party/git/t/t4013/diff.diff-tree_--cc_--stat_--summary_master deleted file mode 100644 index d019867dd9..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--cc_--stat_--summary_master +++ /dev/null @@ -1,6 +0,0 @@ -$ git diff-tree --cc --stat --summary master -59d314ad6f356dd08601a4cd5e530381da3e3c64 - dir/sub | 2 ++ - file0 | 3 +++ - 2 files changed, 5 insertions(+) -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--cc_--stat_--summary_side b/third_party/git/t/t4013/diff.diff-tree_--cc_--stat_--summary_side deleted file mode 100644 index 12b2eee17e..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--cc_--stat_--summary_side +++ /dev/null @@ -1,8 +0,0 @@ -$ git diff-tree --cc --stat --summary side -c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--cc_--stat_master b/third_party/git/t/t4013/diff.diff-tree_--cc_--stat_master deleted file mode 100644 index 40b91796b3..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--cc_--stat_master +++ /dev/null @@ -1,6 +0,0 @@ -$ git diff-tree --cc --stat master -59d314ad6f356dd08601a4cd5e530381da3e3c64 - dir/sub | 2 ++ - file0 | 3 +++ - 2 files changed, 5 insertions(+) -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--cc_--summary_REVERSE b/third_party/git/t/t4013/diff.diff-tree_--cc_--summary_REVERSE deleted file mode 100644 index e208dd5682..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--cc_--summary_REVERSE +++ /dev/null @@ -1,6 +0,0 @@ -$ git diff-tree --cc --summary REVERSE -2562325a7ee916efb2481da93073b82cec801cbc - create mode 100644 file1 - delete mode 100644 file2 - delete mode 100644 file3 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--cc_master b/third_party/git/t/t4013/diff.diff-tree_--cc_master deleted file mode 100644 index 5ecb4e14ae..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--cc_master +++ /dev/null @@ -1,30 +0,0 @@ -$ git diff-tree --cc master -59d314ad6f356dd08601a4cd5e530381da3e3c64 -diff --cc dir/sub -index cead32e,7289e35..992913c ---- a/dir/sub -+++ b/dir/sub -@@@ -1,6 -1,4 +1,8 @@@ - A - B - +C - +D - +E - +F -+ 1 -+ 2 -diff --cc file0 -index b414108,f4615da..10a8a9f ---- a/file0 -+++ b/file0 -@@@ -1,6 -1,6 +1,9 @@@ - 1 - 2 - 3 - +4 - +5 - +6 -+ A -+ B -+ C -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--patch-with-raw_initial b/third_party/git/t/t4013/diff.diff-tree_--patch-with-raw_initial deleted file mode 100644 index fc177ab3f2..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--patch-with-raw_initial +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff-tree --patch-with-raw initial -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--patch-with-stat_initial b/third_party/git/t/t4013/diff.diff-tree_--patch-with-stat_initial deleted file mode 100644 index bd905b1c57..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--patch-with-stat_initial +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff-tree --patch-with-stat initial -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_--patch-with-raw_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_--patch-with-raw_initial deleted file mode 100644 index 7bb8b45e3e..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_--patch-with-raw_initial +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff-tree --pretty=oneline --patch-with-raw initial -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_--patch-with-stat_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_--patch-with-stat_initial deleted file mode 100644 index cbdde4f400..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_--patch-with-stat_initial +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff-tree --pretty=oneline --patch-with-stat initial -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-raw_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-raw_initial deleted file mode 100644 index cd79f1a0ff..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-raw_initial +++ /dev/null @@ -1,33 +0,0 @@ -$ git diff-tree --pretty=oneline --root --patch-with-raw initial -444ac553ac7612cc88969031b02b3767fb8a353a Initial -:000000 100644 0000000000000000000000000000000000000000 35d242ba79ae89ac695e26b3d4c27a8e6f028f9e A dir/sub -:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file0 -:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file2 - -diff --git a/dir/sub b/dir/sub -new file mode 100644 -index 0000000..35d242b ---- /dev/null -+++ b/dir/sub -@@ -0,0 +1,2 @@ -+A -+B -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file0 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -diff --git a/file2 b/file2 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file2 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-stat_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-stat_initial deleted file mode 100644 index 817ed06f82..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-stat_initial +++ /dev/null @@ -1,34 +0,0 @@ -$ git diff-tree --pretty=oneline --root --patch-with-stat initial -444ac553ac7612cc88969031b02b3767fb8a353a Initial - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 +++ - 3 files changed, 8 insertions(+) - -diff --git a/dir/sub b/dir/sub -new file mode 100644 -index 0000000..35d242b ---- /dev/null -+++ b/dir/sub -@@ -0,0 +1,2 @@ -+A -+B -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file0 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -diff --git a/file2 b/file2 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file2 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_--root_-p_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_--root_-p_initial deleted file mode 100644 index 3c5092c699..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_--root_-p_initial +++ /dev/null @@ -1,29 +0,0 @@ -$ git diff-tree --pretty=oneline --root -p initial -444ac553ac7612cc88969031b02b3767fb8a353a Initial -diff --git a/dir/sub b/dir/sub -new file mode 100644 -index 0000000..35d242b ---- /dev/null -+++ b/dir/sub -@@ -0,0 +1,2 @@ -+A -+B -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file0 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -diff --git a/file2 b/file2 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file2 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_--root_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_--root_initial deleted file mode 100644 index 08920ac658..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_--root_initial +++ /dev/null @@ -1,6 +0,0 @@ -$ git diff-tree --pretty=oneline --root initial -444ac553ac7612cc88969031b02b3767fb8a353a Initial -:000000 040000 0000000000000000000000000000000000000000 da7a33fa77d8066d6698643940ce5860fe2d7fb3 A dir -:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file0 -:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file2 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_-p_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_-p_initial deleted file mode 100644 index 94b76bfef1..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_-p_initial +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff-tree --pretty=oneline -p initial -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_initial deleted file mode 100644 index d50970d574..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty=oneline_initial +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff-tree --pretty=oneline initial -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_--patch-with-raw_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty_--patch-with-raw_initial deleted file mode 100644 index 3a85316d8a..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty_--patch-with-raw_initial +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff-tree --pretty --patch-with-raw initial -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_--patch-with-stat_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty_--patch-with-stat_initial deleted file mode 100644 index 2e08239a46..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty_--patch-with-stat_initial +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff-tree --pretty --patch-with-stat initial -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_--patch-with-stat_side b/third_party/git/t/t4013/diff.diff-tree_--pretty_--patch-with-stat_side deleted file mode 100644 index fe3f6b7c7e..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty_--patch-with-stat_side +++ /dev/null @@ -1,43 +0,0 @@ -$ git diff-tree --pretty --patch-with-stat side -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_--patch-with-raw_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_--patch-with-raw_initial deleted file mode 100644 index a3203bd19b..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_--patch-with-raw_initial +++ /dev/null @@ -1,38 +0,0 @@ -$ git diff-tree --pretty --root --patch-with-raw initial -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial - -:000000 100644 0000000000000000000000000000000000000000 35d242ba79ae89ac695e26b3d4c27a8e6f028f9e A dir/sub -:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file0 -:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file2 - -diff --git a/dir/sub b/dir/sub -new file mode 100644 -index 0000000..35d242b ---- /dev/null -+++ b/dir/sub -@@ -0,0 +1,2 @@ -+A -+B -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file0 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -diff --git a/file2 b/file2 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file2 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_--patch-with-stat_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_--patch-with-stat_initial deleted file mode 100644 index 06eb77e386..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_--patch-with-stat_initial +++ /dev/null @@ -1,39 +0,0 @@ -$ git diff-tree --pretty --root --patch-with-stat initial -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 +++ - 3 files changed, 8 insertions(+) - -diff --git a/dir/sub b/dir/sub -new file mode 100644 -index 0000000..35d242b ---- /dev/null -+++ b/dir/sub -@@ -0,0 +1,2 @@ -+A -+B -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file0 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -diff --git a/file2 b/file2 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file2 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_--stat_--compact-summary_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_--stat_--compact-summary_initial deleted file mode 100644 index d6451ff7cc..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_--stat_--compact-summary_initial +++ /dev/null @@ -1,12 +0,0 @@ -$ git diff-tree --pretty --root --stat --compact-summary initial -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial - - dir/sub (new) | 2 ++ - file0 (new) | 3 +++ - file2 (new) | 3 +++ - 3 files changed, 8 insertions(+) -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_--stat_--summary_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_--stat_--summary_initial deleted file mode 100644 index 680eab5f27..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_--stat_--summary_initial +++ /dev/null @@ -1,15 +0,0 @@ -$ git diff-tree --pretty --root --stat --summary initial -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial - - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 +++ - 3 files changed, 8 insertions(+) - create mode 100644 dir/sub - create mode 100644 file0 - create mode 100644 file2 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_--stat_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_--stat_initial deleted file mode 100644 index 9722d1b3a7..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_--stat_initial +++ /dev/null @@ -1,12 +0,0 @@ -$ git diff-tree --pretty --root --stat initial -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial - - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 +++ - 3 files changed, 8 insertions(+) -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_--summary_-r_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_--summary_-r_initial deleted file mode 100644 index ccdaafb377..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_--summary_-r_initial +++ /dev/null @@ -1,11 +0,0 @@ -$ git diff-tree --pretty --root --summary -r initial -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial - - create mode 100644 dir/sub - create mode 100644 file0 - create mode 100644 file2 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_--summary_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_--summary_initial deleted file mode 100644 index 58e5f74aea..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_--summary_initial +++ /dev/null @@ -1,11 +0,0 @@ -$ git diff-tree --pretty --root --summary initial -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial - - create mode 100644 dir/sub - create mode 100644 file0 - create mode 100644 file2 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_-p_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_-p_initial deleted file mode 100644 index d0411f64ec..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_-p_initial +++ /dev/null @@ -1,34 +0,0 @@ -$ git diff-tree --pretty --root -p initial -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial - -diff --git a/dir/sub b/dir/sub -new file mode 100644 -index 0000000..35d242b ---- /dev/null -+++ b/dir/sub -@@ -0,0 +1,2 @@ -+A -+B -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file0 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -diff --git a/file2 b/file2 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file2 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_initial deleted file mode 100644 index 94e32eabb1..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty_--root_initial +++ /dev/null @@ -1,11 +0,0 @@ -$ git diff-tree --pretty --root initial -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial - -:000000 040000 0000000000000000000000000000000000000000 da7a33fa77d8066d6698643940ce5860fe2d7fb3 A dir -:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file0 -:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file2 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_--stat_--summary_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty_--stat_--summary_initial deleted file mode 100644 index c22983ac4a..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty_--stat_--summary_initial +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff-tree --pretty --stat --summary initial -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_--stat_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty_--stat_initial deleted file mode 100644 index 8fdcfb4c0a..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty_--stat_initial +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff-tree --pretty --stat initial -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_--summary_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty_--summary_initial deleted file mode 100644 index 9bc2c4fbad..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty_--summary_initial +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff-tree --pretty --summary initial -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_-R_--root_--stat_--compact-summary_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty_-R_--root_--stat_--compact-summary_initial deleted file mode 100644 index 1989e55cd0..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty_-R_--root_--stat_--compact-summary_initial +++ /dev/null @@ -1,12 +0,0 @@ -$ git diff-tree --pretty -R --root --stat --compact-summary initial -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial - - dir/sub (gone) | 2 -- - file0 (gone) | 3 --- - file2 (gone) | 3 --- - 3 files changed, 8 deletions(-) -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_-p_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty_-p_initial deleted file mode 100644 index 3c9942faf4..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty_-p_initial +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff-tree --pretty -p initial -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_-p_side b/third_party/git/t/t4013/diff.diff-tree_--pretty_-p_side deleted file mode 100644 index b993aa7b89..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty_-p_side +++ /dev/null @@ -1,38 +0,0 @@ -$ git diff-tree --pretty -p side -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_initial b/third_party/git/t/t4013/diff.diff-tree_--pretty_initial deleted file mode 100644 index 14715bf7d0..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty_initial +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff-tree --pretty initial -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--pretty_side b/third_party/git/t/t4013/diff.diff-tree_--pretty_side deleted file mode 100644 index e9b6e1c102..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--pretty_side +++ /dev/null @@ -1,11 +0,0 @@ -$ git diff-tree --pretty side -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side - -:040000 040000 da7a33fa77d8066d6698643940ce5860fe2d7fb3 f977ed46ae6873c1c30ab878e15a4accedc3618b M dir -:100644 100644 01e79c32a8c99c557f0757da7cb6d65b3414466d f4615da674c09df322d6ba8d6b21ecfb1b1ba510 M file0 -:000000 100644 0000000000000000000000000000000000000000 7289e35bff32727c08dda207511bec138fdb9ea5 A file3 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--root_--abbrev_initial b/third_party/git/t/t4013/diff.diff-tree_--root_--abbrev_initial deleted file mode 100644 index 5aa84b2a86..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--root_--abbrev_initial +++ /dev/null @@ -1,6 +0,0 @@ -$ git diff-tree --root --abbrev initial -444ac553ac7612cc88969031b02b3767fb8a353a -:000000 040000 0000000... da7a33f... A dir -:000000 100644 0000000... 01e79c3... A file0 -:000000 100644 0000000... 01e79c3... A file2 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--root_--patch-with-raw_initial b/third_party/git/t/t4013/diff.diff-tree_--root_--patch-with-raw_initial deleted file mode 100644 index d295e475dd..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--root_--patch-with-raw_initial +++ /dev/null @@ -1,33 +0,0 @@ -$ git diff-tree --root --patch-with-raw initial -444ac553ac7612cc88969031b02b3767fb8a353a -:000000 100644 0000000000000000000000000000000000000000 35d242ba79ae89ac695e26b3d4c27a8e6f028f9e A dir/sub -:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file0 -:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file2 - -diff --git a/dir/sub b/dir/sub -new file mode 100644 -index 0000000..35d242b ---- /dev/null -+++ b/dir/sub -@@ -0,0 +1,2 @@ -+A -+B -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file0 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -diff --git a/file2 b/file2 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file2 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--root_--patch-with-stat_initial b/third_party/git/t/t4013/diff.diff-tree_--root_--patch-with-stat_initial deleted file mode 100644 index ad69ffe647..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--root_--patch-with-stat_initial +++ /dev/null @@ -1,34 +0,0 @@ -$ git diff-tree --root --patch-with-stat initial -444ac553ac7612cc88969031b02b3767fb8a353a - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 +++ - 3 files changed, 8 insertions(+) - -diff --git a/dir/sub b/dir/sub -new file mode 100644 -index 0000000..35d242b ---- /dev/null -+++ b/dir/sub -@@ -0,0 +1,2 @@ -+A -+B -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file0 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -diff --git a/file2 b/file2 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file2 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--root_-p_initial b/third_party/git/t/t4013/diff.diff-tree_--root_-p_initial deleted file mode 100644 index 3219c72fcb..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--root_-p_initial +++ /dev/null @@ -1,29 +0,0 @@ -$ git diff-tree --root -p initial -444ac553ac7612cc88969031b02b3767fb8a353a -diff --git a/dir/sub b/dir/sub -new file mode 100644 -index 0000000..35d242b ---- /dev/null -+++ b/dir/sub -@@ -0,0 +1,2 @@ -+A -+B -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file0 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -diff --git a/file2 b/file2 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file2 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--root_-r_--abbrev=4_initial b/third_party/git/t/t4013/diff.diff-tree_--root_-r_--abbrev=4_initial deleted file mode 100644 index 0c5361688c..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--root_-r_--abbrev=4_initial +++ /dev/null @@ -1,6 +0,0 @@ -$ git diff-tree --root -r --abbrev=4 initial -444ac553ac7612cc88969031b02b3767fb8a353a -:000000 100644 0000... 35d2... A dir/sub -:000000 100644 0000... 01e7... A file0 -:000000 100644 0000... 01e7... A file2 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--root_-r_--abbrev_initial b/third_party/git/t/t4013/diff.diff-tree_--root_-r_--abbrev_initial deleted file mode 100644 index c7b460faf6..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--root_-r_--abbrev_initial +++ /dev/null @@ -1,6 +0,0 @@ -$ git diff-tree --root -r --abbrev initial -444ac553ac7612cc88969031b02b3767fb8a353a -:000000 100644 0000000... 35d242b... A dir/sub -:000000 100644 0000000... 01e79c3... A file0 -:000000 100644 0000000... 01e79c3... A file2 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--root_-r_initial b/third_party/git/t/t4013/diff.diff-tree_--root_-r_initial deleted file mode 100644 index eed435e175..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--root_-r_initial +++ /dev/null @@ -1,6 +0,0 @@ -$ git diff-tree --root -r initial -444ac553ac7612cc88969031b02b3767fb8a353a -:000000 100644 0000000000000000000000000000000000000000 35d242ba79ae89ac695e26b3d4c27a8e6f028f9e A dir/sub -:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file0 -:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file2 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--root_initial b/third_party/git/t/t4013/diff.diff-tree_--root_initial deleted file mode 100644 index ddf6b068ab..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--root_initial +++ /dev/null @@ -1,6 +0,0 @@ -$ git diff-tree --root initial -444ac553ac7612cc88969031b02b3767fb8a353a -:000000 040000 0000000000000000000000000000000000000000 da7a33fa77d8066d6698643940ce5860fe2d7fb3 A dir -:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file0 -:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file2 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--stat_--compact-summary_initial_mode b/third_party/git/t/t4013/diff.diff-tree_--stat_--compact-summary_initial_mode deleted file mode 100644 index 9c7c8f63af..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--stat_--compact-summary_initial_mode +++ /dev/null @@ -1,4 +0,0 @@ -$ git diff-tree --stat --compact-summary initial mode - file0 (mode +x) | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--stat_initial_mode b/third_party/git/t/t4013/diff.diff-tree_--stat_initial_mode deleted file mode 100644 index 0e5943c2c6..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--stat_initial_mode +++ /dev/null @@ -1,4 +0,0 @@ -$ git diff-tree --stat initial mode - file0 | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_--summary_initial_mode b/third_party/git/t/t4013/diff.diff-tree_--summary_initial_mode deleted file mode 100644 index 25846b6af8..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_--summary_initial_mode +++ /dev/null @@ -1,3 +0,0 @@ -$ git diff-tree --summary initial mode - mode change 100644 => 100755 file0 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_-R_--stat_--compact-summary_initial_mode b/third_party/git/t/t4013/diff.diff-tree_-R_--stat_--compact-summary_initial_mode deleted file mode 100644 index e38f3d3bfb..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_-R_--stat_--compact-summary_initial_mode +++ /dev/null @@ -1,4 +0,0 @@ -$ git diff-tree -R --stat --compact-summary initial mode - file0 (mode -x) | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_-c_--abbrev_master b/third_party/git/t/t4013/diff.diff-tree_-c_--abbrev_master deleted file mode 100644 index b8e4aa2530..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_-c_--abbrev_master +++ /dev/null @@ -1,5 +0,0 @@ -$ git diff-tree -c --abbrev master -59d314ad6f356dd08601a4cd5e530381da3e3c64 -::100644 100644 100644 cead32e... 7289e35... 992913c... MM dir/sub -::100644 100644 100644 b414108... f4615da... 10a8a9f... MM file0 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_-c_--stat_--summary_master b/third_party/git/t/t4013/diff.diff-tree_-c_--stat_--summary_master deleted file mode 100644 index 81c3021541..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_-c_--stat_--summary_master +++ /dev/null @@ -1,6 +0,0 @@ -$ git diff-tree -c --stat --summary master -59d314ad6f356dd08601a4cd5e530381da3e3c64 - dir/sub | 2 ++ - file0 | 3 +++ - 2 files changed, 5 insertions(+) -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_-c_--stat_--summary_side b/third_party/git/t/t4013/diff.diff-tree_-c_--stat_--summary_side deleted file mode 100644 index e8dc12bfbf..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_-c_--stat_--summary_side +++ /dev/null @@ -1,8 +0,0 @@ -$ git diff-tree -c --stat --summary side -c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_-c_--stat_master b/third_party/git/t/t4013/diff.diff-tree_-c_--stat_master deleted file mode 100644 index 89d59b1548..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_-c_--stat_master +++ /dev/null @@ -1,6 +0,0 @@ -$ git diff-tree -c --stat master -59d314ad6f356dd08601a4cd5e530381da3e3c64 - dir/sub | 2 ++ - file0 | 3 +++ - 2 files changed, 5 insertions(+) -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_-c_master b/third_party/git/t/t4013/diff.diff-tree_-c_master deleted file mode 100644 index e2d2bb2611..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_-c_master +++ /dev/null @@ -1,5 +0,0 @@ -$ git diff-tree -c master -59d314ad6f356dd08601a4cd5e530381da3e3c64 -::100644 100644 100644 cead32e925b1420c84c14cbf7cf755e7e45af8ad 7289e35bff32727c08dda207511bec138fdb9ea5 992913c5aa0a5476d10c49ed0f21fc0c6d1aedf3 MM dir/sub -::100644 100644 100644 b414108e81e5091fe0974a1858b4d0d22b107f70 f4615da674c09df322d6ba8d6b21ecfb1b1ba510 10a8a9f3657f91a156b9f0184ed79a20adef9f7f MM file0 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_-p_-m_master b/third_party/git/t/t4013/diff.diff-tree_-p_-m_master deleted file mode 100644 index b60bea039d..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_-p_-m_master +++ /dev/null @@ -1,80 +0,0 @@ -$ git diff-tree -p -m master -59d314ad6f356dd08601a4cd5e530381da3e3c64 -diff --git a/dir/sub b/dir/sub -index cead32e..992913c 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -4,3 +4,5 @@ C - D - E - F -+1 -+2 -diff --git a/file0 b/file0 -index b414108..10a8a9f 100644 ---- a/file0 -+++ b/file0 -@@ -4,3 +4,6 @@ - 4 - 5 - 6 -+A -+B -+C -59d314ad6f356dd08601a4cd5e530381da3e3c64 -diff --git a/dir/sub b/dir/sub -index 7289e35..992913c 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,4 +1,8 @@ - A - B -+C -+D -+E -+F - 1 - 2 -diff --git a/file0 b/file0 -index f4615da..10a8a9f 100644 ---- a/file0 -+++ b/file0 -@@ -1,6 +1,9 @@ - 1 - 2 - 3 -+4 -+5 -+6 - A - B - C -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 -diff --git a/file3 b/file3 -deleted file mode 100644 -index 7289e35..0000000 ---- a/file3 -+++ /dev/null -@@ -1,4 +0,0 @@ --A --B --1 --2 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_-p_initial b/third_party/git/t/t4013/diff.diff-tree_-p_initial deleted file mode 100644 index e20ce88370..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_-p_initial +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff-tree -p initial -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_-p_master b/third_party/git/t/t4013/diff.diff-tree_-p_master deleted file mode 100644 index b182875fb2..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_-p_master +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff-tree -p master -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_-r_--abbrev=4_initial b/third_party/git/t/t4013/diff.diff-tree_-r_--abbrev=4_initial deleted file mode 100644 index c5a3aa5aa4..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_-r_--abbrev=4_initial +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff-tree -r --abbrev=4 initial -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_-r_--abbrev_initial b/third_party/git/t/t4013/diff.diff-tree_-r_--abbrev_initial deleted file mode 100644 index 0b689b773c..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_-r_--abbrev_initial +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff-tree -r --abbrev initial -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_-r_initial b/third_party/git/t/t4013/diff.diff-tree_-r_initial deleted file mode 100644 index 1765d83ce4..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_-r_initial +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff-tree -r initial -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_initial b/third_party/git/t/t4013/diff.diff-tree_initial deleted file mode 100644 index b49fc53457..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_initial +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff-tree initial -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_initial_mode b/third_party/git/t/t4013/diff.diff-tree_initial_mode deleted file mode 100644 index c47c09423e..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_initial_mode +++ /dev/null @@ -1,3 +0,0 @@ -$ git diff-tree initial mode -:100644 100755 01e79c32a8c99c557f0757da7cb6d65b3414466d 01e79c32a8c99c557f0757da7cb6d65b3414466d M file0 -$ diff --git a/third_party/git/t/t4013/diff.diff-tree_master b/third_party/git/t/t4013/diff.diff-tree_master deleted file mode 100644 index fe9226f8a1..0000000000 --- a/third_party/git/t/t4013/diff.diff-tree_master +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff-tree master -$ diff --git a/third_party/git/t/t4013/diff.diff_--abbrev_initial..side b/third_party/git/t/t4013/diff.diff_--abbrev_initial..side deleted file mode 100644 index a88e66f817..0000000000 --- a/third_party/git/t/t4013/diff.diff_--abbrev_initial..side +++ /dev/null @@ -1,32 +0,0 @@ -$ git diff --abbrev initial..side -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 -$ diff --git a/third_party/git/t/t4013/diff.diff_--cached b/third_party/git/t/t4013/diff.diff_--cached deleted file mode 100644 index ff16e83e7c..0000000000 --- a/third_party/git/t/t4013/diff.diff_--cached +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/dir/sub b/dir/sub -new file mode 100644 -index 0000000..992913c ---- /dev/null -+++ b/dir/sub -@@ -0,0 +1,8 @@ -+A -+B -+C -+D -+E -+F -+1 -+2 -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..10a8a9f ---- /dev/null -+++ b/file0 -@@ -0,0 +1,9 @@ -+1 -+2 -+3 -+4 -+5 -+6 -+A -+B -+C -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C diff --git a/third_party/git/t/t4013/diff.diff_--cached_--_file0 b/third_party/git/t/t4013/diff.diff_--cached_--_file0 deleted file mode 100644 index b9bb858a03..0000000000 --- a/third_party/git/t/t4013/diff.diff_--cached_--_file0 +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..10a8a9f ---- /dev/null -+++ b/file0 -@@ -0,0 +1,9 @@ -+1 -+2 -+3 -+4 -+5 -+6 -+A -+B -+C diff --git a/third_party/git/t/t4013/diff.diff_--dirstat-by-file_initial_rearrange b/third_party/git/t/t4013/diff.diff_--dirstat-by-file_initial_rearrange deleted file mode 100644 index e48e33f678..0000000000 --- a/third_party/git/t/t4013/diff.diff_--dirstat-by-file_initial_rearrange +++ /dev/null @@ -1,3 +0,0 @@ -$ git diff --dirstat-by-file initial rearrange - 100.0% dir/ -$ diff --git a/third_party/git/t/t4013/diff.diff_--dirstat_--cc_master~1_master b/third_party/git/t/t4013/diff.diff_--dirstat_--cc_master~1_master deleted file mode 100644 index fba4e34175..0000000000 --- a/third_party/git/t/t4013/diff.diff_--dirstat_--cc_master~1_master +++ /dev/null @@ -1,3 +0,0 @@ -$ git diff --dirstat --cc master~1 master - 40.0% dir/ -$ diff --git a/third_party/git/t/t4013/diff.diff_--dirstat_initial_rearrange b/third_party/git/t/t4013/diff.diff_--dirstat_initial_rearrange deleted file mode 100644 index 5fb02c13bc..0000000000 --- a/third_party/git/t/t4013/diff.diff_--dirstat_initial_rearrange +++ /dev/null @@ -1,3 +0,0 @@ -$ git diff --dirstat initial rearrange - 100.0% dir/ -$ diff --git a/third_party/git/t/t4013/diff.diff_--dirstat_master~1_master~2 b/third_party/git/t/t4013/diff.diff_--dirstat_master~1_master~2 deleted file mode 100644 index b672e1ca63..0000000000 --- a/third_party/git/t/t4013/diff.diff_--dirstat_master~1_master~2 +++ /dev/null @@ -1,3 +0,0 @@ -$ git diff --dirstat master~1 master~2 - 40.0% dir/ -$ diff --git a/third_party/git/t/t4013/diff.diff_--line-prefix=abc_master_master^_side b/third_party/git/t/t4013/diff.diff_--line-prefix=abc_master_master^_side deleted file mode 100644 index 99f91e7f0e..0000000000 --- a/third_party/git/t/t4013/diff.diff_--line-prefix=abc_master_master^_side +++ /dev/null @@ -1,29 +0,0 @@ -$ git diff --line-prefix=abc master master^ side -abcdiff --cc dir/sub -abcindex cead32e,7289e35..992913c -abc--- a/dir/sub -abc+++ b/dir/sub -abc@@@ -1,6 -1,4 +1,8 @@@ -abc A -abc B -abc +C -abc +D -abc +E -abc +F -abc+ 1 -abc+ 2 -abcdiff --cc file0 -abcindex b414108,f4615da..10a8a9f -abc--- a/file0 -abc+++ b/file0 -abc@@@ -1,6 -1,6 +1,9 @@@ -abc 1 -abc 2 -abc 3 -abc +4 -abc +5 -abc +6 -abc+ A -abc+ B -abc+ C -$ diff --git a/third_party/git/t/t4013/diff.diff_--line-prefix_--cached_--_file0 b/third_party/git/t/t4013/diff.diff_--line-prefix_--cached_--_file0 deleted file mode 100644 index f41ba4d36a..0000000000 --- a/third_party/git/t/t4013/diff.diff_--line-prefix_--cached_--_file0 +++ /dev/null @@ -1,15 +0,0 @@ -| | | diff --git a/file0 b/file0 -| | | new file mode 100644 -| | | index 0000000..10a8a9f -| | | --- /dev/null -| | | +++ b/file0 -| | | @@ -0,0 +1,9 @@ -| | | +1 -| | | +2 -| | | +3 -| | | +4 -| | | +5 -| | | +6 -| | | +A -| | | +B -| | | +C diff --git a/third_party/git/t/t4013/diff.diff_--name-status_dir2_dir b/third_party/git/t/t4013/diff.diff_--name-status_dir2_dir deleted file mode 100644 index d0d96aaa91..0000000000 --- a/third_party/git/t/t4013/diff.diff_--name-status_dir2_dir +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff --name-status dir2 dir -$ diff --git a/third_party/git/t/t4013/diff.diff_--no-index_--name-status_--_dir2_dir b/third_party/git/t/t4013/diff.diff_--no-index_--name-status_--_dir2_dir deleted file mode 100644 index 6756f8de67..0000000000 --- a/third_party/git/t/t4013/diff.diff_--no-index_--name-status_--_dir2_dir +++ /dev/null @@ -1,3 +0,0 @@ -$ git diff --no-index --name-status -- dir2 dir -A dir/sub -$ diff --git a/third_party/git/t/t4013/diff.diff_--no-index_--name-status_dir2_dir b/third_party/git/t/t4013/diff.diff_--no-index_--name-status_dir2_dir deleted file mode 100644 index 6a47584777..0000000000 --- a/third_party/git/t/t4013/diff.diff_--no-index_--name-status_dir2_dir +++ /dev/null @@ -1,3 +0,0 @@ -$ git diff --no-index --name-status dir2 dir -A dir/sub -$ diff --git a/third_party/git/t/t4013/diff.diff_--no-index_--raw_--abbrev=4_dir2_dir b/third_party/git/t/t4013/diff.diff_--no-index_--raw_--abbrev=4_dir2_dir deleted file mode 100644 index a71b38a833..0000000000 --- a/third_party/git/t/t4013/diff.diff_--no-index_--raw_--abbrev=4_dir2_dir +++ /dev/null @@ -1,3 +0,0 @@ -$ git diff --no-index --raw --abbrev=4 dir2 dir -:000000 100644 0000... 0000... A dir/sub -$ diff --git a/third_party/git/t/t4013/diff.diff_--no-index_--raw_--no-abbrev_dir2_dir b/third_party/git/t/t4013/diff.diff_--no-index_--raw_--no-abbrev_dir2_dir deleted file mode 100644 index e0f00977c8..0000000000 --- a/third_party/git/t/t4013/diff.diff_--no-index_--raw_--no-abbrev_dir2_dir +++ /dev/null @@ -1,3 +0,0 @@ -$ git diff --no-index --raw --no-abbrev dir2 dir -:000000 100644 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 A dir/sub -$ diff --git a/third_party/git/t/t4013/diff.diff_--no-index_--raw_dir2_dir b/third_party/git/t/t4013/diff.diff_--no-index_--raw_dir2_dir deleted file mode 100644 index 3cb4ee7a9a..0000000000 --- a/third_party/git/t/t4013/diff.diff_--no-index_--raw_dir2_dir +++ /dev/null @@ -1,3 +0,0 @@ -$ git diff --no-index --raw dir2 dir -:000000 100644 0000000... 0000000... A dir/sub -$ diff --git a/third_party/git/t/t4013/diff.diff_--no-index_dir_dir3 b/third_party/git/t/t4013/diff.diff_--no-index_dir_dir3 deleted file mode 100644 index 2142c2b9ad..0000000000 --- a/third_party/git/t/t4013/diff.diff_--no-index_dir_dir3 +++ /dev/null @@ -1,2 +0,0 @@ -$ git diff --no-index dir dir3 -$ diff --git a/third_party/git/t/t4013/diff.diff_--patch-with-raw_-r_initial..side b/third_party/git/t/t4013/diff.diff_--patch-with-raw_-r_initial..side deleted file mode 100644 index 3590dc79a6..0000000000 --- a/third_party/git/t/t4013/diff.diff_--patch-with-raw_-r_initial..side +++ /dev/null @@ -1,36 +0,0 @@ -$ git diff --patch-with-raw -r initial..side -:100644 100644 35d242b... 7289e35... M dir/sub -:100644 100644 01e79c3... f4615da... M file0 -:000000 100644 0000000... 7289e35... A file3 - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 -$ diff --git a/third_party/git/t/t4013/diff.diff_--patch-with-raw_initial..side b/third_party/git/t/t4013/diff.diff_--patch-with-raw_initial..side deleted file mode 100644 index b21d5dc6f3..0000000000 --- a/third_party/git/t/t4013/diff.diff_--patch-with-raw_initial..side +++ /dev/null @@ -1,36 +0,0 @@ -$ git diff --patch-with-raw initial..side -:100644 100644 35d242b... 7289e35... M dir/sub -:100644 100644 01e79c3... f4615da... M file0 -:000000 100644 0000000... 7289e35... A file3 - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 -$ diff --git a/third_party/git/t/t4013/diff.diff_--patch-with-stat_-r_initial..side b/third_party/git/t/t4013/diff.diff_--patch-with-stat_-r_initial..side deleted file mode 100644 index be8d1ea1bd..0000000000 --- a/third_party/git/t/t4013/diff.diff_--patch-with-stat_-r_initial..side +++ /dev/null @@ -1,37 +0,0 @@ -$ git diff --patch-with-stat -r initial..side - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 -$ diff --git a/third_party/git/t/t4013/diff.diff_--patch-with-stat_initial..side b/third_party/git/t/t4013/diff.diff_--patch-with-stat_initial..side deleted file mode 100644 index 5424e6d566..0000000000 --- a/third_party/git/t/t4013/diff.diff_--patch-with-stat_initial..side +++ /dev/null @@ -1,37 +0,0 @@ -$ git diff --patch-with-stat initial..side - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 -$ diff --git a/third_party/git/t/t4013/diff.diff_--raw_--abbrev=4_initial b/third_party/git/t/t4013/diff.diff_--raw_--abbrev=4_initial deleted file mode 100644 index c3641db31d..0000000000 --- a/third_party/git/t/t4013/diff.diff_--raw_--abbrev=4_initial +++ /dev/null @@ -1,6 +0,0 @@ -$ git diff --raw --abbrev=4 initial -:100644 100644 35d2... 9929... M dir/sub -:100644 100644 01e7... 10a8... M file0 -:000000 100644 0000... b1e6... A file1 -:100644 000000 01e7... 0000... D file2 -$ diff --git a/third_party/git/t/t4013/diff.diff_--raw_--no-abbrev_initial b/third_party/git/t/t4013/diff.diff_--raw_--no-abbrev_initial deleted file mode 100644 index c87a1258e3..0000000000 --- a/third_party/git/t/t4013/diff.diff_--raw_--no-abbrev_initial +++ /dev/null @@ -1,6 +0,0 @@ -$ git diff --raw --no-abbrev initial -:100644 100644 35d242ba79ae89ac695e26b3d4c27a8e6f028f9e 992913c5aa0a5476d10c49ed0f21fc0c6d1aedf3 M dir/sub -:100644 100644 01e79c32a8c99c557f0757da7cb6d65b3414466d 10a8a9f3657f91a156b9f0184ed79a20adef9f7f M file0 -:000000 100644 0000000000000000000000000000000000000000 b1e67221afe8461efd244b487afca22d46b95eb8 A file1 -:100644 000000 01e79c32a8c99c557f0757da7cb6d65b3414466d 0000000000000000000000000000000000000000 D file2 -$ diff --git a/third_party/git/t/t4013/diff.diff_--raw_initial b/third_party/git/t/t4013/diff.diff_--raw_initial deleted file mode 100644 index a3e978040d..0000000000 --- a/third_party/git/t/t4013/diff.diff_--raw_initial +++ /dev/null @@ -1,6 +0,0 @@ -$ git diff --raw initial -:100644 100644 35d242b... 992913c... M dir/sub -:100644 100644 01e79c3... 10a8a9f... M file0 -:000000 100644 0000000... b1e6722... A file1 -:100644 000000 01e79c3... 0000000... D file2 -$ diff --git a/third_party/git/t/t4013/diff.diff_--stat_initial..side b/third_party/git/t/t4013/diff.diff_--stat_initial..side deleted file mode 100644 index b7741e2b83..0000000000 --- a/third_party/git/t/t4013/diff.diff_--stat_initial..side +++ /dev/null @@ -1,6 +0,0 @@ -$ git diff --stat initial..side - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) -$ diff --git a/third_party/git/t/t4013/diff.diff_-U1_initial..side b/third_party/git/t/t4013/diff.diff_-U1_initial..side deleted file mode 100644 index b69f8f048a..0000000000 --- a/third_party/git/t/t4013/diff.diff_-U1_initial..side +++ /dev/null @@ -1,29 +0,0 @@ -$ git diff -U1 initial..side -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2 +2,3 @@ A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -3 +3,4 @@ - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 -$ diff --git a/third_party/git/t/t4013/diff.diff_-U2_initial..side b/third_party/git/t/t4013/diff.diff_-U2_initial..side deleted file mode 100644 index 8ffe04f203..0000000000 --- a/third_party/git/t/t4013/diff.diff_-U2_initial..side +++ /dev/null @@ -1,31 +0,0 @@ -$ git diff -U2 initial..side -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -2,2 +2,5 @@ - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 -$ diff --git a/third_party/git/t/t4013/diff.diff_-U_initial..side b/third_party/git/t/t4013/diff.diff_-U_initial..side deleted file mode 100644 index c66c0dd5c6..0000000000 --- a/third_party/git/t/t4013/diff.diff_-U_initial..side +++ /dev/null @@ -1,32 +0,0 @@ -$ git diff -U initial..side -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 -$ diff --git a/third_party/git/t/t4013/diff.diff_-r_--stat_initial..side b/third_party/git/t/t4013/diff.diff_-r_--stat_initial..side deleted file mode 100644 index 5d514f55b9..0000000000 --- a/third_party/git/t/t4013/diff.diff_-r_--stat_initial..side +++ /dev/null @@ -1,6 +0,0 @@ -$ git diff -r --stat initial..side - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) -$ diff --git a/third_party/git/t/t4013/diff.diff_-r_initial..side b/third_party/git/t/t4013/diff.diff_-r_initial..side deleted file mode 100644 index 5bb2fe2f28..0000000000 --- a/third_party/git/t/t4013/diff.diff_-r_initial..side +++ /dev/null @@ -1,32 +0,0 @@ -$ git diff -r initial..side -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 -$ diff --git a/third_party/git/t/t4013/diff.diff_initial..side b/third_party/git/t/t4013/diff.diff_initial..side deleted file mode 100644 index c8adaf5958..0000000000 --- a/third_party/git/t/t4013/diff.diff_initial..side +++ /dev/null @@ -1,32 +0,0 @@ -$ git diff initial..side -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 -$ diff --git a/third_party/git/t/t4013/diff.diff_master_master^_side b/third_party/git/t/t4013/diff.diff_master_master^_side deleted file mode 100644 index 50ec9cadd6..0000000000 --- a/third_party/git/t/t4013/diff.diff_master_master^_side +++ /dev/null @@ -1,29 +0,0 @@ -$ git diff master master^ side -diff --cc dir/sub -index cead32e,7289e35..992913c ---- a/dir/sub -+++ b/dir/sub -@@@ -1,6 -1,4 +1,8 @@@ - A - B - +C - +D - +E - +F -+ 1 -+ 2 -diff --cc file0 -index b414108,f4615da..10a8a9f ---- a/file0 -+++ b/file0 -@@@ -1,6 -1,6 +1,9 @@@ - 1 - 2 - 3 - +4 - +5 - +6 -+ A -+ B -+ C -$ diff --git a/third_party/git/t/t4013/diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side b/third_party/git/t/t4013/diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side deleted file mode 100644 index 547ca065a5..0000000000 --- a/third_party/git/t/t4013/diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side +++ /dev/null @@ -1,61 +0,0 @@ -$ git format-patch --attach --stdout --suffix=.diff initial..side -From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:03:00 +0000 -Subject: [PATCH] Side -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="0001-Side.diff" -Content-Transfer-Encoding: 8bit -Content-Disposition: attachment; filename="0001-Side.diff" - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - ---------------g-i-t--v-e-r-s-i-o-n-- - - -$ diff --git a/third_party/git/t/t4013/diff.format-patch_--attach_--stdout_initial..master b/third_party/git/t/t4013/diff.format-patch_--attach_--stdout_initial..master deleted file mode 100644 index 52fedc179e..0000000000 --- a/third_party/git/t/t4013/diff.format-patch_--attach_--stdout_initial..master +++ /dev/null @@ -1,170 +0,0 @@ -$ git format-patch --attach --stdout initial..master -From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:01:00 +0000 -Subject: [PATCH 1/3] Second -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - - -This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - delete mode 100644 file2 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="0001-Second.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: attachment; filename="0001-Second.patch" - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - ---------------g-i-t--v-e-r-s-i-o-n-- - - - -From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:02:00 +0000 -Subject: [PATCH 2/3] Third -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - create mode 100644 file1 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="0002-Third.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: attachment; filename="0002-Third.patch" - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - ---------------g-i-t--v-e-r-s-i-o-n-- - - - -From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:03:00 +0000 -Subject: [PATCH 3/3] Side -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="0003-Side.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: attachment; filename="0003-Side.patch" - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - ---------------g-i-t--v-e-r-s-i-o-n-- - - -$ diff --git a/third_party/git/t/t4013/diff.format-patch_--attach_--stdout_initial..master^ b/third_party/git/t/t4013/diff.format-patch_--attach_--stdout_initial..master^ deleted file mode 100644 index 1c3cde251b..0000000000 --- a/third_party/git/t/t4013/diff.format-patch_--attach_--stdout_initial..master^ +++ /dev/null @@ -1,110 +0,0 @@ -$ git format-patch --attach --stdout initial..master^ -From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:01:00 +0000 -Subject: [PATCH 1/2] Second -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - - -This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - delete mode 100644 file2 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="0001-Second.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: attachment; filename="0001-Second.patch" - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - ---------------g-i-t--v-e-r-s-i-o-n-- - - - -From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:02:00 +0000 -Subject: [PATCH 2/2] Third -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - create mode 100644 file1 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="0002-Third.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: attachment; filename="0002-Third.patch" - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - ---------------g-i-t--v-e-r-s-i-o-n-- - - -$ diff --git a/third_party/git/t/t4013/diff.format-patch_--attach_--stdout_initial..side b/third_party/git/t/t4013/diff.format-patch_--attach_--stdout_initial..side deleted file mode 100644 index 4717bd8313..0000000000 --- a/third_party/git/t/t4013/diff.format-patch_--attach_--stdout_initial..side +++ /dev/null @@ -1,61 +0,0 @@ -$ git format-patch --attach --stdout initial..side -From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:03:00 +0000 -Subject: [PATCH] Side -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="0001-Side.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: attachment; filename="0001-Side.patch" - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - ---------------g-i-t--v-e-r-s-i-o-n-- - - -$ diff --git a/third_party/git/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master b/third_party/git/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master deleted file mode 100644 index 02c4db7ec5..0000000000 --- a/third_party/git/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master +++ /dev/null @@ -1,170 +0,0 @@ -$ git format-patch --inline --stdout --numbered-files initial..master -From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:01:00 +0000 -Subject: [PATCH 1/3] Second -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - - -This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - delete mode 100644 file2 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="1" -Content-Transfer-Encoding: 8bit -Content-Disposition: inline; filename="1" - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - ---------------g-i-t--v-e-r-s-i-o-n-- - - - -From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:02:00 +0000 -Subject: [PATCH 2/3] Third -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - create mode 100644 file1 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="2" -Content-Transfer-Encoding: 8bit -Content-Disposition: inline; filename="2" - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - ---------------g-i-t--v-e-r-s-i-o-n-- - - - -From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:03:00 +0000 -Subject: [PATCH 3/3] Side -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="3" -Content-Transfer-Encoding: 8bit -Content-Disposition: inline; filename="3" - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - ---------------g-i-t--v-e-r-s-i-o-n-- - - -$ diff --git a/third_party/git/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master b/third_party/git/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master deleted file mode 100644 index c7677c5951..0000000000 --- a/third_party/git/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master +++ /dev/null @@ -1,170 +0,0 @@ -$ git format-patch --inline --stdout --subject-prefix=TESTCASE initial..master -From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:01:00 +0000 -Subject: [TESTCASE 1/3] Second -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - - -This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - delete mode 100644 file2 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="0001-Second.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: inline; filename="0001-Second.patch" - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - ---------------g-i-t--v-e-r-s-i-o-n-- - - - -From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:02:00 +0000 -Subject: [TESTCASE 2/3] Third -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - create mode 100644 file1 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="0002-Third.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: inline; filename="0002-Third.patch" - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - ---------------g-i-t--v-e-r-s-i-o-n-- - - - -From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:03:00 +0000 -Subject: [TESTCASE 3/3] Side -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="0003-Side.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: inline; filename="0003-Side.patch" - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - ---------------g-i-t--v-e-r-s-i-o-n-- - - -$ diff --git a/third_party/git/t/t4013/diff.format-patch_--inline_--stdout_initial..master b/third_party/git/t/t4013/diff.format-patch_--inline_--stdout_initial..master deleted file mode 100644 index 5b3e34e2c0..0000000000 --- a/third_party/git/t/t4013/diff.format-patch_--inline_--stdout_initial..master +++ /dev/null @@ -1,170 +0,0 @@ -$ git format-patch --inline --stdout initial..master -From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:01:00 +0000 -Subject: [PATCH 1/3] Second -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - - -This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - delete mode 100644 file2 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="0001-Second.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: inline; filename="0001-Second.patch" - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - ---------------g-i-t--v-e-r-s-i-o-n-- - - - -From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:02:00 +0000 -Subject: [PATCH 2/3] Third -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - create mode 100644 file1 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="0002-Third.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: inline; filename="0002-Third.patch" - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - ---------------g-i-t--v-e-r-s-i-o-n-- - - - -From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:03:00 +0000 -Subject: [PATCH 3/3] Side -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="0003-Side.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: inline; filename="0003-Side.patch" - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - ---------------g-i-t--v-e-r-s-i-o-n-- - - -$ diff --git a/third_party/git/t/t4013/diff.format-patch_--inline_--stdout_initial..master^ b/third_party/git/t/t4013/diff.format-patch_--inline_--stdout_initial..master^ deleted file mode 100644 index d13f8a8128..0000000000 --- a/third_party/git/t/t4013/diff.format-patch_--inline_--stdout_initial..master^ +++ /dev/null @@ -1,110 +0,0 @@ -$ git format-patch --inline --stdout initial..master^ -From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:01:00 +0000 -Subject: [PATCH 1/2] Second -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - - -This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - delete mode 100644 file2 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="0001-Second.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: inline; filename="0001-Second.patch" - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - ---------------g-i-t--v-e-r-s-i-o-n-- - - - -From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:02:00 +0000 -Subject: [PATCH 2/2] Third -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - create mode 100644 file1 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="0002-Third.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: inline; filename="0002-Third.patch" - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - ---------------g-i-t--v-e-r-s-i-o-n-- - - -$ diff --git a/third_party/git/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^ b/third_party/git/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^ deleted file mode 100644 index caec5537de..0000000000 --- a/third_party/git/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^ +++ /dev/null @@ -1,62 +0,0 @@ -$ git format-patch --inline --stdout initial..master^^ -From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:01:00 +0000 -Subject: [DIFFERENT_PREFIX] Second -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - - -This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - delete mode 100644 file2 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="0001-Second.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: inline; filename="0001-Second.patch" - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - ---------------g-i-t--v-e-r-s-i-o-n-- - - -$ diff --git a/third_party/git/t/t4013/diff.format-patch_--inline_--stdout_initial..side b/third_party/git/t/t4013/diff.format-patch_--inline_--stdout_initial..side deleted file mode 100644 index d3a6762130..0000000000 --- a/third_party/git/t/t4013/diff.format-patch_--inline_--stdout_initial..side +++ /dev/null @@ -1,61 +0,0 @@ -$ git format-patch --inline --stdout initial..side -From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:03:00 +0000 -Subject: [PATCH] Side -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="0001-Side.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: inline; filename="0001-Side.patch" - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - ---------------g-i-t--v-e-r-s-i-o-n-- - - -$ diff --git a/third_party/git/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^ b/third_party/git/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^ deleted file mode 100644 index 244d964fc6..0000000000 --- a/third_party/git/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^ +++ /dev/null @@ -1,103 +0,0 @@ -$ git format-patch --stdout --cover-letter -n initial..master^ -From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001 -From: C O Mitter <committer@example.com> -Date: Mon, 26 Jun 2006 00:06:00 +0000 -Subject: [DIFFERENT_PREFIX 0/2] *** SUBJECT HERE *** - -*** BLURB HERE *** - -A U Thor (2): - Second - Third - - dir/sub | 4 ++++ - file0 | 3 +++ - file1 | 3 +++ - file2 | 3 --- - 4 files changed, 10 insertions(+), 3 deletions(-) - create mode 100644 file1 - delete mode 100644 file2 - --- -g-i-t--v-e-r-s-i-o-n - -From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:01:00 +0000 -Subject: [DIFFERENT_PREFIX 1/2] Second - -This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - delete mode 100644 file2 - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 --- -g-i-t--v-e-r-s-i-o-n - - -From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:02:00 +0000 -Subject: [DIFFERENT_PREFIX 2/2] Third - ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - create mode 100644 file1 - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C --- -g-i-t--v-e-r-s-i-o-n - -$ diff --git a/third_party/git/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master b/third_party/git/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master deleted file mode 100644 index bfc287a147..0000000000 --- a/third_party/git/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master +++ /dev/null @@ -1,127 +0,0 @@ -$ git format-patch --stdout --no-numbered initial..master -From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:01:00 +0000 -Subject: [PATCH] Second - -This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - delete mode 100644 file2 - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 --- -g-i-t--v-e-r-s-i-o-n - - -From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:02:00 +0000 -Subject: [PATCH] Third - ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - create mode 100644 file1 - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C --- -g-i-t--v-e-r-s-i-o-n - - -From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:03:00 +0000 -Subject: [PATCH] Side - ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 --- -g-i-t--v-e-r-s-i-o-n - -$ diff --git a/third_party/git/t/t4013/diff.format-patch_--stdout_--numbered_initial..master b/third_party/git/t/t4013/diff.format-patch_--stdout_--numbered_initial..master deleted file mode 100644 index 568f6f584e..0000000000 --- a/third_party/git/t/t4013/diff.format-patch_--stdout_--numbered_initial..master +++ /dev/null @@ -1,127 +0,0 @@ -$ git format-patch --stdout --numbered initial..master -From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:01:00 +0000 -Subject: [PATCH 1/3] Second - -This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - delete mode 100644 file2 - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 --- -g-i-t--v-e-r-s-i-o-n - - -From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:02:00 +0000 -Subject: [PATCH 2/3] Third - ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - create mode 100644 file1 - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C --- -g-i-t--v-e-r-s-i-o-n - - -From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:03:00 +0000 -Subject: [PATCH 3/3] Side - ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 --- -g-i-t--v-e-r-s-i-o-n - -$ diff --git a/third_party/git/t/t4013/diff.format-patch_--stdout_initial..master b/third_party/git/t/t4013/diff.format-patch_--stdout_initial..master deleted file mode 100644 index 5f0352f9f7..0000000000 --- a/third_party/git/t/t4013/diff.format-patch_--stdout_initial..master +++ /dev/null @@ -1,127 +0,0 @@ -$ git format-patch --stdout initial..master -From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:01:00 +0000 -Subject: [PATCH 1/3] Second - -This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - delete mode 100644 file2 - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 --- -g-i-t--v-e-r-s-i-o-n - - -From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:02:00 +0000 -Subject: [PATCH 2/3] Third - ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - create mode 100644 file1 - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C --- -g-i-t--v-e-r-s-i-o-n - - -From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:03:00 +0000 -Subject: [PATCH 3/3] Side - ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 --- -g-i-t--v-e-r-s-i-o-n - -$ diff --git a/third_party/git/t/t4013/diff.format-patch_--stdout_initial..master^ b/third_party/git/t/t4013/diff.format-patch_--stdout_initial..master^ deleted file mode 100644 index 2ae454d807..0000000000 --- a/third_party/git/t/t4013/diff.format-patch_--stdout_initial..master^ +++ /dev/null @@ -1,81 +0,0 @@ -$ git format-patch --stdout initial..master^ -From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:01:00 +0000 -Subject: [PATCH 1/2] Second - -This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - delete mode 100644 file2 - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 --- -g-i-t--v-e-r-s-i-o-n - - -From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:02:00 +0000 -Subject: [PATCH 2/2] Third - ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - create mode 100644 file1 - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C --- -g-i-t--v-e-r-s-i-o-n - -$ diff --git a/third_party/git/t/t4013/diff.format-patch_--stdout_initial..side b/third_party/git/t/t4013/diff.format-patch_--stdout_initial..side deleted file mode 100644 index a7d52fbeea..0000000000 --- a/third_party/git/t/t4013/diff.format-patch_--stdout_initial..side +++ /dev/null @@ -1,47 +0,0 @@ -$ git format-patch --stdout initial..side -From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:03:00 +0000 -Subject: [PATCH] Side - ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 --- -g-i-t--v-e-r-s-i-o-n - -$ diff --git a/third_party/git/t/t4013/diff.log_--decorate=full_--all b/third_party/git/t/t4013/diff.log_--decorate=full_--all deleted file mode 100644 index 2afe91f116..0000000000 --- a/third_party/git/t/t4013/diff.log_--decorate=full_--all +++ /dev/null @@ -1,46 +0,0 @@ -$ git log --decorate=full --all -commit b7e0bc69303b488b47deca799a7d723971dfa6cd (refs/heads/mode) -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:06:00 2006 +0000 - - update mode - -commit cd4e72fd96faed3f0ba949dc42967430374e2290 (refs/heads/rearrange) -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:06:00 2006 +0000 - - Rearranged lines in dir/sub - -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> refs/heads/master) -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (refs/heads/side) -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. - -commit 444ac553ac7612cc88969031b02b3767fb8a353a (refs/heads/initial) -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial -$ diff --git a/third_party/git/t/t4013/diff.log_--decorate_--all b/third_party/git/t/t4013/diff.log_--decorate_--all deleted file mode 100644 index d0f308ab2b..0000000000 --- a/third_party/git/t/t4013/diff.log_--decorate_--all +++ /dev/null @@ -1,46 +0,0 @@ -$ git log --decorate --all -commit b7e0bc69303b488b47deca799a7d723971dfa6cd (mode) -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:06:00 2006 +0000 - - update mode - -commit cd4e72fd96faed3f0ba949dc42967430374e2290 (rearrange) -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:06:00 2006 +0000 - - Rearranged lines in dir/sub - -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> master) -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (side) -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. - -commit 444ac553ac7612cc88969031b02b3767fb8a353a (initial) -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial -$ diff --git a/third_party/git/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_ b/third_party/git/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_ deleted file mode 100644 index a18f1472a9..0000000000 --- a/third_party/git/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_ +++ /dev/null @@ -1,74 +0,0 @@ -$ git log --patch-with-stat --summary master -- dir/ -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side ---- - dir/sub | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third ---- - dir/sub | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. ---- - dir/sub | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial -$ diff --git a/third_party/git/t/t4013/diff.log_--patch-with-stat_master b/third_party/git/t/t4013/diff.log_--patch-with-stat_master deleted file mode 100644 index ae425c4672..0000000000 --- a/third_party/git/t/t4013/diff.log_--patch-with-stat_master +++ /dev/null @@ -1,129 +0,0 @@ -$ git log --patch-with-stat master -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial -$ diff --git a/third_party/git/t/t4013/diff.log_--patch-with-stat_master_--_dir_ b/third_party/git/t/t4013/diff.log_--patch-with-stat_master_--_dir_ deleted file mode 100644 index d5207cadf4..0000000000 --- a/third_party/git/t/t4013/diff.log_--patch-with-stat_master_--_dir_ +++ /dev/null @@ -1,74 +0,0 @@ -$ git log --patch-with-stat master -- dir/ -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side ---- - dir/sub | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third ---- - dir/sub | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. ---- - dir/sub | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial -$ diff --git a/third_party/git/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master b/third_party/git/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master deleted file mode 100644 index 0fc1e8cd71..0000000000 --- a/third_party/git/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master +++ /dev/null @@ -1,199 +0,0 @@ -$ git log --root --cc --patch-with-stat --summary master -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - - dir/sub | 2 ++ - file0 | 3 +++ - 2 files changed, 5 insertions(+) - -diff --cc dir/sub -index cead32e,7289e35..992913c ---- a/dir/sub -+++ b/dir/sub -@@@ -1,6 -1,4 +1,8 @@@ - A - B - +C - +D - +E - +F -+ 1 -+ 2 -diff --cc file0 -index b414108,f4615da..10a8a9f ---- a/file0 -+++ b/file0 -@@@ -1,6 -1,6 +1,9 @@@ - 1 - 2 - 3 - +4 - +5 - +6 -+ A -+ B -+ C - -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - create mode 100644 file1 - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - delete mode 100644 file2 - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 +++ - 3 files changed, 8 insertions(+) - create mode 100644 dir/sub - create mode 100644 file0 - create mode 100644 file2 - -diff --git a/dir/sub b/dir/sub -new file mode 100644 -index 0000000..35d242b ---- /dev/null -+++ b/dir/sub -@@ -0,0 +1,2 @@ -+A -+B -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file0 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -diff --git a/file2 b/file2 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file2 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -$ diff --git a/third_party/git/t/t4013/diff.log_--root_--patch-with-stat_--summary_master b/third_party/git/t/t4013/diff.log_--root_--patch-with-stat_--summary_master deleted file mode 100644 index dffc09dde9..0000000000 --- a/third_party/git/t/t4013/diff.log_--root_--patch-with-stat_--summary_master +++ /dev/null @@ -1,167 +0,0 @@ -$ git log --root --patch-with-stat --summary master -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - create mode 100644 file1 - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - delete mode 100644 file2 - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 +++ - 3 files changed, 8 insertions(+) - create mode 100644 dir/sub - create mode 100644 file0 - create mode 100644 file2 - -diff --git a/dir/sub b/dir/sub -new file mode 100644 -index 0000000..35d242b ---- /dev/null -+++ b/dir/sub -@@ -0,0 +1,2 @@ -+A -+B -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file0 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -diff --git a/file2 b/file2 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file2 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -$ diff --git a/third_party/git/t/t4013/diff.log_--root_--patch-with-stat_master b/third_party/git/t/t4013/diff.log_--root_--patch-with-stat_master deleted file mode 100644 index 55aa98012d..0000000000 --- a/third_party/git/t/t4013/diff.log_--root_--patch-with-stat_master +++ /dev/null @@ -1,161 +0,0 @@ -$ git log --root --patch-with-stat master -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 +++ - 3 files changed, 8 insertions(+) - -diff --git a/dir/sub b/dir/sub -new file mode 100644 -index 0000000..35d242b ---- /dev/null -+++ b/dir/sub -@@ -0,0 +1,2 @@ -+A -+B -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file0 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -diff --git a/file2 b/file2 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file2 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -$ diff --git a/third_party/git/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master b/third_party/git/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master deleted file mode 100644 index 019d85f7de..0000000000 --- a/third_party/git/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master +++ /dev/null @@ -1,199 +0,0 @@ -$ git log --root -c --patch-with-stat --summary master -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - - dir/sub | 2 ++ - file0 | 3 +++ - 2 files changed, 5 insertions(+) - -diff --combined dir/sub -index cead32e,7289e35..992913c ---- a/dir/sub -+++ b/dir/sub -@@@ -1,6 -1,4 +1,8 @@@ - A - B - +C - +D - +E - +F -+ 1 -+ 2 -diff --combined file0 -index b414108,f4615da..10a8a9f ---- a/file0 -+++ b/file0 -@@@ -1,6 -1,6 +1,9 @@@ - 1 - 2 - 3 - +4 - +5 - +6 -+ A -+ B -+ C - -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - create mode 100644 file1 - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - delete mode 100644 file2 - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 +++ - 3 files changed, 8 insertions(+) - create mode 100644 dir/sub - create mode 100644 file0 - create mode 100644 file2 - -diff --git a/dir/sub b/dir/sub -new file mode 100644 -index 0000000..35d242b ---- /dev/null -+++ b/dir/sub -@@ -0,0 +1,2 @@ -+A -+B -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file0 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -diff --git a/file2 b/file2 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file2 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -$ diff --git a/third_party/git/t/t4013/diff.log_--root_-p_master b/third_party/git/t/t4013/diff.log_--root_-p_master deleted file mode 100644 index b42c334439..0000000000 --- a/third_party/git/t/t4013/diff.log_--root_-p_master +++ /dev/null @@ -1,142 +0,0 @@ -$ git log --root -p master -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial - -diff --git a/dir/sub b/dir/sub -new file mode 100644 -index 0000000..35d242b ---- /dev/null -+++ b/dir/sub -@@ -0,0 +1,2 @@ -+A -+B -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file0 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -diff --git a/file2 b/file2 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file2 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -$ diff --git a/third_party/git/t/t4013/diff.log_--root_master b/third_party/git/t/t4013/diff.log_--root_master deleted file mode 100644 index e8f46159da..0000000000 --- a/third_party/git/t/t4013/diff.log_--root_master +++ /dev/null @@ -1,34 +0,0 @@ -$ git log --root master -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial -$ diff --git a/third_party/git/t/t4013/diff.log_-GF_-p_--pickaxe-all_master b/third_party/git/t/t4013/diff.log_-GF_-p_--pickaxe-all_master deleted file mode 100644 index d36f88098b..0000000000 --- a/third_party/git/t/t4013/diff.log_-GF_-p_--pickaxe-all_master +++ /dev/null @@ -1,27 +0,0 @@ -$ git log -GF -p --pickaxe-all master -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C -$ diff --git a/third_party/git/t/t4013/diff.log_-GF_-p_master b/third_party/git/t/t4013/diff.log_-GF_-p_master deleted file mode 100644 index 9d93f2c23a..0000000000 --- a/third_party/git/t/t4013/diff.log_-GF_-p_master +++ /dev/null @@ -1,18 +0,0 @@ -$ git log -GF -p master -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -$ diff --git a/third_party/git/t/t4013/diff.log_-GF_master b/third_party/git/t/t4013/diff.log_-GF_master deleted file mode 100644 index 4c6708d2d0..0000000000 --- a/third_party/git/t/t4013/diff.log_-GF_master +++ /dev/null @@ -1,7 +0,0 @@ -$ git log -GF master -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third -$ diff --git a/third_party/git/t/t4013/diff.log_-SF_-p_master b/third_party/git/t/t4013/diff.log_-SF_-p_master deleted file mode 100644 index 5e32438972..0000000000 --- a/third_party/git/t/t4013/diff.log_-SF_-p_master +++ /dev/null @@ -1,18 +0,0 @@ -$ git log -SF -p master -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -$ diff --git a/third_party/git/t/t4013/diff.log_-SF_master b/third_party/git/t/t4013/diff.log_-SF_master deleted file mode 100644 index c1599f2f52..0000000000 --- a/third_party/git/t/t4013/diff.log_-SF_master +++ /dev/null @@ -1,7 +0,0 @@ -$ git log -SF master -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third -$ diff --git a/third_party/git/t/t4013/diff.log_-SF_master_--max-count=0 b/third_party/git/t/t4013/diff.log_-SF_master_--max-count=0 deleted file mode 100644 index c1fc6c8731..0000000000 --- a/third_party/git/t/t4013/diff.log_-SF_master_--max-count=0 +++ /dev/null @@ -1,2 +0,0 @@ -$ git log -SF master --max-count=0 -$ diff --git a/third_party/git/t/t4013/diff.log_-SF_master_--max-count=1 b/third_party/git/t/t4013/diff.log_-SF_master_--max-count=1 deleted file mode 100644 index c981a03814..0000000000 --- a/third_party/git/t/t4013/diff.log_-SF_master_--max-count=1 +++ /dev/null @@ -1,7 +0,0 @@ -$ git log -SF master --max-count=1 -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third -$ diff --git a/third_party/git/t/t4013/diff.log_-SF_master_--max-count=2 b/third_party/git/t/t4013/diff.log_-SF_master_--max-count=2 deleted file mode 100644 index a6c55fd482..0000000000 --- a/third_party/git/t/t4013/diff.log_-SF_master_--max-count=2 +++ /dev/null @@ -1,7 +0,0 @@ -$ git log -SF master --max-count=2 -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third -$ diff --git a/third_party/git/t/t4013/diff.log_-S_F_master b/third_party/git/t/t4013/diff.log_-S_F_master deleted file mode 100644 index 978d2b4118..0000000000 --- a/third_party/git/t/t4013/diff.log_-S_F_master +++ /dev/null @@ -1,7 +0,0 @@ -$ git log -S F master -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third -$ diff --git a/third_party/git/t/t4013/diff.log_-m_-p_--first-parent_master b/third_party/git/t/t4013/diff.log_-m_-p_--first-parent_master deleted file mode 100644 index 7a0073f529..0000000000 --- a/third_party/git/t/t4013/diff.log_-m_-p_--first-parent_master +++ /dev/null @@ -1,100 +0,0 @@ -$ git log -m -p --first-parent master -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -diff --git a/dir/sub b/dir/sub -index cead32e..992913c 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -4,3 +4,5 @@ C - D - E - F -+1 -+2 -diff --git a/file0 b/file0 -index b414108..10a8a9f 100644 ---- a/file0 -+++ b/file0 -@@ -4,3 +4,6 @@ - 4 - 5 - 6 -+A -+B -+C - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial -$ diff --git a/third_party/git/t/t4013/diff.log_-m_-p_master b/third_party/git/t/t4013/diff.log_-m_-p_master deleted file mode 100644 index 9ca62a01ed..0000000000 --- a/third_party/git/t/t4013/diff.log_-m_-p_master +++ /dev/null @@ -1,200 +0,0 @@ -$ git log -m -p master -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0) -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -diff --git a/dir/sub b/dir/sub -index cead32e..992913c 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -4,3 +4,5 @@ C - D - E - F -+1 -+2 -diff --git a/file0 b/file0 -index b414108..10a8a9f 100644 ---- a/file0 -+++ b/file0 -@@ -4,3 +4,6 @@ - 4 - 5 - 6 -+A -+B -+C - -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a) -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -diff --git a/dir/sub b/dir/sub -index 7289e35..992913c 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,4 +1,8 @@ - A - B -+C -+D -+E -+F - 1 - 2 -diff --git a/file0 b/file0 -index f4615da..10a8a9f 100644 ---- a/file0 -+++ b/file0 -@@ -1,6 +1,9 @@ - 1 - 2 - 3 -+4 -+5 -+6 - A - B - C -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 -diff --git a/file3 b/file3 -deleted file mode 100644 -index 7289e35..0000000 ---- a/file3 -+++ /dev/null -@@ -1,4 +0,0 @@ --A --B --1 --2 - -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial -$ diff --git a/third_party/git/t/t4013/diff.log_-p_--first-parent_master b/third_party/git/t/t4013/diff.log_-p_--first-parent_master deleted file mode 100644 index 3fc896d424..0000000000 --- a/third_party/git/t/t4013/diff.log_-p_--first-parent_master +++ /dev/null @@ -1,78 +0,0 @@ -$ git log -p --first-parent master -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial -$ diff --git a/third_party/git/t/t4013/diff.log_-p_master b/third_party/git/t/t4013/diff.log_-p_master deleted file mode 100644 index bf1326dc36..0000000000 --- a/third_party/git/t/t4013/diff.log_-p_master +++ /dev/null @@ -1,115 +0,0 @@ -$ git log -p master -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial -$ diff --git a/third_party/git/t/t4013/diff.log_master b/third_party/git/t/t4013/diff.log_master deleted file mode 100644 index a8f6ce5abd..0000000000 --- a/third_party/git/t/t4013/diff.log_master +++ /dev/null @@ -1,34 +0,0 @@ -$ git log master -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial -$ diff --git a/third_party/git/t/t4013/diff.noellipses-diff-tree_--root_--abbrev_initial b/third_party/git/t/t4013/diff.noellipses-diff-tree_--root_--abbrev_initial deleted file mode 100644 index 4bdad4072e..0000000000 --- a/third_party/git/t/t4013/diff.noellipses-diff-tree_--root_--abbrev_initial +++ /dev/null @@ -1,6 +0,0 @@ -$ git diff-tree --root --abbrev initial -444ac553ac7612cc88969031b02b3767fb8a353a -:000000 040000 0000000 da7a33f A dir -:000000 100644 0000000 01e79c3 A file0 -:000000 100644 0000000 01e79c3 A file2 -$ diff --git a/third_party/git/t/t4013/diff.noellipses-diff-tree_--root_-r_--abbrev=4_initial b/third_party/git/t/t4013/diff.noellipses-diff-tree_--root_-r_--abbrev=4_initial deleted file mode 100644 index 26fbfeb177..0000000000 --- a/third_party/git/t/t4013/diff.noellipses-diff-tree_--root_-r_--abbrev=4_initial +++ /dev/null @@ -1,6 +0,0 @@ -$ git diff-tree --root -r --abbrev=4 initial -444ac553ac7612cc88969031b02b3767fb8a353a -:000000 100644 0000 35d2 A dir/sub -:000000 100644 0000 01e7 A file0 -:000000 100644 0000 01e7 A file2 -$ diff --git a/third_party/git/t/t4013/diff.noellipses-diff-tree_--root_-r_--abbrev_initial b/third_party/git/t/t4013/diff.noellipses-diff-tree_--root_-r_--abbrev_initial deleted file mode 100644 index 2ac8561191..0000000000 --- a/third_party/git/t/t4013/diff.noellipses-diff-tree_--root_-r_--abbrev_initial +++ /dev/null @@ -1,6 +0,0 @@ -$ git diff-tree --root -r --abbrev initial -444ac553ac7612cc88969031b02b3767fb8a353a -:000000 100644 0000000 35d242b A dir/sub -:000000 100644 0000000 01e79c3 A file0 -:000000 100644 0000000 01e79c3 A file2 -$ diff --git a/third_party/git/t/t4013/diff.noellipses-diff-tree_-c_--abbrev_master b/third_party/git/t/t4013/diff.noellipses-diff-tree_-c_--abbrev_master deleted file mode 100644 index bb80f013b3..0000000000 --- a/third_party/git/t/t4013/diff.noellipses-diff-tree_-c_--abbrev_master +++ /dev/null @@ -1,5 +0,0 @@ -$ git diff-tree -c --abbrev master -59d314ad6f356dd08601a4cd5e530381da3e3c64 -::100644 100644 100644 cead32e 7289e35 992913c MM dir/sub -::100644 100644 100644 b414108 f4615da 10a8a9f MM file0 -$ diff --git a/third_party/git/t/t4013/diff.noellipses-diff_--no-index_--raw_--abbrev=4_dir2_dir b/third_party/git/t/t4013/diff.noellipses-diff_--no-index_--raw_--abbrev=4_dir2_dir deleted file mode 100644 index 41b7baf0a5..0000000000 --- a/third_party/git/t/t4013/diff.noellipses-diff_--no-index_--raw_--abbrev=4_dir2_dir +++ /dev/null @@ -1,3 +0,0 @@ -$ git diff --no-index --raw --abbrev=4 dir2 dir -:000000 100644 0000 0000 A dir/sub -$ diff --git a/third_party/git/t/t4013/diff.noellipses-diff_--no-index_--raw_dir2_dir b/third_party/git/t/t4013/diff.noellipses-diff_--no-index_--raw_dir2_dir deleted file mode 100644 index 0cf3a3efea..0000000000 --- a/third_party/git/t/t4013/diff.noellipses-diff_--no-index_--raw_dir2_dir +++ /dev/null @@ -1,3 +0,0 @@ -$ git diff --no-index --raw dir2 dir -:000000 100644 0000000 0000000 A dir/sub -$ diff --git a/third_party/git/t/t4013/diff.noellipses-diff_--patch-with-raw_-r_initial..side b/third_party/git/t/t4013/diff.noellipses-diff_--patch-with-raw_-r_initial..side deleted file mode 100644 index 8d1f1e3721..0000000000 --- a/third_party/git/t/t4013/diff.noellipses-diff_--patch-with-raw_-r_initial..side +++ /dev/null @@ -1,36 +0,0 @@ -$ git diff --patch-with-raw -r initial..side -:100644 100644 35d242b 7289e35 M dir/sub -:100644 100644 01e79c3 f4615da M file0 -:000000 100644 0000000 7289e35 A file3 - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 -$ diff --git a/third_party/git/t/t4013/diff.noellipses-diff_--patch-with-raw_initial..side b/third_party/git/t/t4013/diff.noellipses-diff_--patch-with-raw_initial..side deleted file mode 100644 index 50d8aee4f7..0000000000 --- a/third_party/git/t/t4013/diff.noellipses-diff_--patch-with-raw_initial..side +++ /dev/null @@ -1,36 +0,0 @@ -$ git diff --patch-with-raw initial..side -:100644 100644 35d242b 7289e35 M dir/sub -:100644 100644 01e79c3 f4615da M file0 -:000000 100644 0000000 7289e35 A file3 - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 -$ diff --git a/third_party/git/t/t4013/diff.noellipses-diff_--raw_--abbrev=4_initial b/third_party/git/t/t4013/diff.noellipses-diff_--raw_--abbrev=4_initial deleted file mode 100644 index 8ae44d6c83..0000000000 --- a/third_party/git/t/t4013/diff.noellipses-diff_--raw_--abbrev=4_initial +++ /dev/null @@ -1,6 +0,0 @@ -$ git diff --raw --abbrev=4 initial -:100644 100644 35d2 9929 M dir/sub -:100644 100644 01e7 10a8 M file0 -:000000 100644 0000 b1e6 A file1 -:100644 000000 01e7 0000 D file2 -$ diff --git a/third_party/git/t/t4013/diff.noellipses-diff_--raw_initial b/third_party/git/t/t4013/diff.noellipses-diff_--raw_initial deleted file mode 100644 index 0175bfb281..0000000000 --- a/third_party/git/t/t4013/diff.noellipses-diff_--raw_initial +++ /dev/null @@ -1,6 +0,0 @@ -$ git diff --raw initial -:100644 100644 35d242b 992913c M dir/sub -:100644 100644 01e79c3 10a8a9f M file0 -:000000 100644 0000000 b1e6722 A file1 -:100644 000000 01e79c3 0000000 D file2 -$ diff --git a/third_party/git/t/t4013/diff.noellipses-show_--patch-with-raw_side b/third_party/git/t/t4013/diff.noellipses-show_--patch-with-raw_side deleted file mode 100644 index 32fed3d576..0000000000 --- a/third_party/git/t/t4013/diff.noellipses-show_--patch-with-raw_side +++ /dev/null @@ -1,42 +0,0 @@ -$ git show --patch-with-raw side -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side - -:100644 100644 35d242b 7289e35 M dir/sub -:100644 100644 01e79c3 f4615da M file0 -:000000 100644 0000000 7289e35 A file3 - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 -$ diff --git a/third_party/git/t/t4013/diff.noellipses-whatchanged_--root_master b/third_party/git/t/t4013/diff.noellipses-whatchanged_--root_master deleted file mode 100644 index c2cfd4e729..0000000000 --- a/third_party/git/t/t4013/diff.noellipses-whatchanged_--root_master +++ /dev/null @@ -1,42 +0,0 @@ -$ git whatchanged --root master -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side - -:100644 100644 35d242b 7289e35 M dir/sub -:100644 100644 01e79c3 f4615da M file0 -:000000 100644 0000000 7289e35 A file3 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -:100644 100644 8422d40 cead32e M dir/sub -:000000 100644 0000000 b1e6722 A file1 - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. - -:100644 100644 35d242b 8422d40 M dir/sub -:100644 100644 01e79c3 b414108 M file0 -:100644 000000 01e79c3 0000000 D file2 - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial - -:000000 100644 0000000 35d242b A dir/sub -:000000 100644 0000000 01e79c3 A file0 -:000000 100644 0000000 01e79c3 A file2 -$ diff --git a/third_party/git/t/t4013/diff.noellipses-whatchanged_-SF_master b/third_party/git/t/t4013/diff.noellipses-whatchanged_-SF_master deleted file mode 100644 index b36ce5886e..0000000000 --- a/third_party/git/t/t4013/diff.noellipses-whatchanged_-SF_master +++ /dev/null @@ -1,9 +0,0 @@ -$ git whatchanged -SF master -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -:100644 100644 8422d40 cead32e M dir/sub -$ diff --git a/third_party/git/t/t4013/diff.noellipses-whatchanged_master b/third_party/git/t/t4013/diff.noellipses-whatchanged_master deleted file mode 100644 index 55e500f2ed..0000000000 --- a/third_party/git/t/t4013/diff.noellipses-whatchanged_master +++ /dev/null @@ -1,32 +0,0 @@ -$ git whatchanged master -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side - -:100644 100644 35d242b 7289e35 M dir/sub -:100644 100644 01e79c3 f4615da M file0 -:000000 100644 0000000 7289e35 A file3 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -:100644 100644 8422d40 cead32e M dir/sub -:000000 100644 0000000 b1e6722 A file1 - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. - -:100644 100644 35d242b 8422d40 M dir/sub -:100644 100644 01e79c3 b414108 M file0 -:100644 000000 01e79c3 0000000 D file2 -$ diff --git a/third_party/git/t/t4013/diff.rev-list_--children_HEAD b/third_party/git/t/t4013/diff.rev-list_--children_HEAD deleted file mode 100644 index e7f17d5aa0..0000000000 --- a/third_party/git/t/t4013/diff.rev-list_--children_HEAD +++ /dev/null @@ -1,7 +0,0 @@ -$ git rev-list --children HEAD -59d314ad6f356dd08601a4cd5e530381da3e3c64 -c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 59d314ad6f356dd08601a4cd5e530381da3e3c64 -9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 59d314ad6f356dd08601a4cd5e530381da3e3c64 -1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -444ac553ac7612cc88969031b02b3767fb8a353a 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -$ diff --git a/third_party/git/t/t4013/diff.rev-list_--parents_HEAD b/third_party/git/t/t4013/diff.rev-list_--parents_HEAD deleted file mode 100644 index 65d2a80208..0000000000 --- a/third_party/git/t/t4013/diff.rev-list_--parents_HEAD +++ /dev/null @@ -1,7 +0,0 @@ -$ git rev-list --parents HEAD -59d314ad6f356dd08601a4cd5e530381da3e3c64 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a 444ac553ac7612cc88969031b02b3767fb8a353a -9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 444ac553ac7612cc88969031b02b3767fb8a353a -444ac553ac7612cc88969031b02b3767fb8a353a -$ diff --git a/third_party/git/t/t4013/diff.show_--first-parent_master b/third_party/git/t/t4013/diff.show_--first-parent_master deleted file mode 100644 index 3dcbe473a0..0000000000 --- a/third_party/git/t/t4013/diff.show_--first-parent_master +++ /dev/null @@ -1,30 +0,0 @@ -$ git show --first-parent master -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -diff --git a/dir/sub b/dir/sub -index cead32e..992913c 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -4,3 +4,5 @@ C - D - E - F -+1 -+2 -diff --git a/file0 b/file0 -index b414108..10a8a9f 100644 ---- a/file0 -+++ b/file0 -@@ -4,3 +4,6 @@ - 4 - 5 - 6 -+A -+B -+C -$ diff --git a/third_party/git/t/t4013/diff.show_--patch-with-raw_side b/third_party/git/t/t4013/diff.show_--patch-with-raw_side deleted file mode 100644 index 221b46a7cc..0000000000 --- a/third_party/git/t/t4013/diff.show_--patch-with-raw_side +++ /dev/null @@ -1,42 +0,0 @@ -$ git show --patch-with-raw side -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side - -:100644 100644 35d242b... 7289e35... M dir/sub -:100644 100644 01e79c3... f4615da... M file0 -:000000 100644 0000000... 7289e35... A file3 - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 -$ diff --git a/third_party/git/t/t4013/diff.show_--patch-with-stat_--summary_side b/third_party/git/t/t4013/diff.show_--patch-with-stat_--summary_side deleted file mode 100644 index 95a474ef1d..0000000000 --- a/third_party/git/t/t4013/diff.show_--patch-with-stat_--summary_side +++ /dev/null @@ -1,44 +0,0 @@ -$ git show --patch-with-stat --summary side -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 -$ diff --git a/third_party/git/t/t4013/diff.show_--patch-with-stat_side b/third_party/git/t/t4013/diff.show_--patch-with-stat_side deleted file mode 100644 index 974e99be82..0000000000 --- a/third_party/git/t/t4013/diff.show_--patch-with-stat_side +++ /dev/null @@ -1,43 +0,0 @@ -$ git show --patch-with-stat side -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 -$ diff --git a/third_party/git/t/t4013/diff.show_--root_initial b/third_party/git/t/t4013/diff.show_--root_initial deleted file mode 100644 index 8c89136c4d..0000000000 --- a/third_party/git/t/t4013/diff.show_--root_initial +++ /dev/null @@ -1,34 +0,0 @@ -$ git show --root initial -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial - -diff --git a/dir/sub b/dir/sub -new file mode 100644 -index 0000000..35d242b ---- /dev/null -+++ b/dir/sub -@@ -0,0 +1,2 @@ -+A -+B -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file0 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -diff --git a/file2 b/file2 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file2 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -$ diff --git a/third_party/git/t/t4013/diff.show_--stat_--summary_side b/third_party/git/t/t4013/diff.show_--stat_--summary_side deleted file mode 100644 index a71492f9bf..0000000000 --- a/third_party/git/t/t4013/diff.show_--stat_--summary_side +++ /dev/null @@ -1,13 +0,0 @@ -$ git show --stat --summary side -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side - - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 -$ diff --git a/third_party/git/t/t4013/diff.show_--stat_side b/third_party/git/t/t4013/diff.show_--stat_side deleted file mode 100644 index 9be712458f..0000000000 --- a/third_party/git/t/t4013/diff.show_--stat_side +++ /dev/null @@ -1,12 +0,0 @@ -$ git show --stat side -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side - - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) -$ diff --git a/third_party/git/t/t4013/diff.show_-c_master b/third_party/git/t/t4013/diff.show_-c_master deleted file mode 100644 index 81aba8da96..0000000000 --- a/third_party/git/t/t4013/diff.show_-c_master +++ /dev/null @@ -1,36 +0,0 @@ -$ git show -c master -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -diff --combined dir/sub -index cead32e,7289e35..992913c ---- a/dir/sub -+++ b/dir/sub -@@@ -1,6 -1,4 +1,8 @@@ - A - B - +C - +D - +E - +F -+ 1 -+ 2 -diff --combined file0 -index b414108,f4615da..10a8a9f ---- a/file0 -+++ b/file0 -@@@ -1,6 -1,6 +1,9 @@@ - 1 - 2 - 3 - +4 - +5 - +6 -+ A -+ B -+ C -$ diff --git a/third_party/git/t/t4013/diff.show_-m_master b/third_party/git/t/t4013/diff.show_-m_master deleted file mode 100644 index 4ea2ee453d..0000000000 --- a/third_party/git/t/t4013/diff.show_-m_master +++ /dev/null @@ -1,93 +0,0 @@ -$ git show -m master -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0) -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -diff --git a/dir/sub b/dir/sub -index cead32e..992913c 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -4,3 +4,5 @@ C - D - E - F -+1 -+2 -diff --git a/file0 b/file0 -index b414108..10a8a9f 100644 ---- a/file0 -+++ b/file0 -@@ -4,3 +4,6 @@ - 4 - 5 - 6 -+A -+B -+C - -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a) -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -diff --git a/dir/sub b/dir/sub -index 7289e35..992913c 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,4 +1,8 @@ - A - B -+C -+D -+E -+F - 1 - 2 -diff --git a/file0 b/file0 -index f4615da..10a8a9f 100644 ---- a/file0 -+++ b/file0 -@@ -1,6 +1,9 @@ - 1 - 2 - 3 -+4 -+5 -+6 - A - B - C -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 -diff --git a/file3 b/file3 -deleted file mode 100644 -index 7289e35..0000000 ---- a/file3 -+++ /dev/null -@@ -1,4 +0,0 @@ --A --B --1 --2 -$ diff --git a/third_party/git/t/t4013/diff.show_initial b/third_party/git/t/t4013/diff.show_initial deleted file mode 100644 index 4c4066ae48..0000000000 --- a/third_party/git/t/t4013/diff.show_initial +++ /dev/null @@ -1,7 +0,0 @@ -$ git show initial -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial -$ diff --git a/third_party/git/t/t4013/diff.show_master b/third_party/git/t/t4013/diff.show_master deleted file mode 100644 index fb08ce0e46..0000000000 --- a/third_party/git/t/t4013/diff.show_master +++ /dev/null @@ -1,36 +0,0 @@ -$ git show master -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -diff --cc dir/sub -index cead32e,7289e35..992913c ---- a/dir/sub -+++ b/dir/sub -@@@ -1,6 -1,4 +1,8 @@@ - A - B - +C - +D - +E - +F -+ 1 -+ 2 -diff --cc file0 -index b414108,f4615da..10a8a9f ---- a/file0 -+++ b/file0 -@@@ -1,6 -1,6 +1,9 @@@ - 1 - 2 - 3 - +4 - +5 - +6 -+ A -+ B -+ C -$ diff --git a/third_party/git/t/t4013/diff.show_side b/third_party/git/t/t4013/diff.show_side deleted file mode 100644 index 530a073b19..0000000000 --- a/third_party/git/t/t4013/diff.show_side +++ /dev/null @@ -1,38 +0,0 @@ -$ git show side -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 -$ diff --git a/third_party/git/t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_ b/third_party/git/t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_ deleted file mode 100644 index c8b6af2f43..0000000000 --- a/third_party/git/t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_ +++ /dev/null @@ -1,61 +0,0 @@ -$ git whatchanged --patch-with-stat --summary master -- dir/ -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side ---- - dir/sub | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third ---- - dir/sub | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. ---- - dir/sub | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -$ diff --git a/third_party/git/t/t4013/diff.whatchanged_--patch-with-stat_master b/third_party/git/t/t4013/diff.whatchanged_--patch-with-stat_master deleted file mode 100644 index 1ac431ba92..0000000000 --- a/third_party/git/t/t4013/diff.whatchanged_--patch-with-stat_master +++ /dev/null @@ -1,116 +0,0 @@ -$ git whatchanged --patch-with-stat master -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 -$ diff --git a/third_party/git/t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_ b/third_party/git/t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_ deleted file mode 100644 index b30c28588f..0000000000 --- a/third_party/git/t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_ +++ /dev/null @@ -1,61 +0,0 @@ -$ git whatchanged --patch-with-stat master -- dir/ -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side ---- - dir/sub | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third ---- - dir/sub | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. ---- - dir/sub | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -$ diff --git a/third_party/git/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master b/third_party/git/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master deleted file mode 100644 index 30aae7817b..0000000000 --- a/third_party/git/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master +++ /dev/null @@ -1,199 +0,0 @@ -$ git whatchanged --root --cc --patch-with-stat --summary master -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - - dir/sub | 2 ++ - file0 | 3 +++ - 2 files changed, 5 insertions(+) - -diff --cc dir/sub -index cead32e,7289e35..992913c ---- a/dir/sub -+++ b/dir/sub -@@@ -1,6 -1,4 +1,8 @@@ - A - B - +C - +D - +E - +F -+ 1 -+ 2 -diff --cc file0 -index b414108,f4615da..10a8a9f ---- a/file0 -+++ b/file0 -@@@ -1,6 -1,6 +1,9 @@@ - 1 - 2 - 3 - +4 - +5 - +6 -+ A -+ B -+ C - -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - create mode 100644 file1 - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - delete mode 100644 file2 - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 +++ - 3 files changed, 8 insertions(+) - create mode 100644 dir/sub - create mode 100644 file0 - create mode 100644 file2 - -diff --git a/dir/sub b/dir/sub -new file mode 100644 -index 0000000..35d242b ---- /dev/null -+++ b/dir/sub -@@ -0,0 +1,2 @@ -+A -+B -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file0 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -diff --git a/file2 b/file2 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file2 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -$ diff --git a/third_party/git/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master b/third_party/git/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master deleted file mode 100644 index db90e51525..0000000000 --- a/third_party/git/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master +++ /dev/null @@ -1,160 +0,0 @@ -$ git whatchanged --root --patch-with-stat --summary master -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - create mode 100644 file1 - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - delete mode 100644 file2 - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 +++ - 3 files changed, 8 insertions(+) - create mode 100644 dir/sub - create mode 100644 file0 - create mode 100644 file2 - -diff --git a/dir/sub b/dir/sub -new file mode 100644 -index 0000000..35d242b ---- /dev/null -+++ b/dir/sub -@@ -0,0 +1,2 @@ -+A -+B -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file0 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -diff --git a/file2 b/file2 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file2 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -$ diff --git a/third_party/git/t/t4013/diff.whatchanged_--root_--patch-with-stat_master b/third_party/git/t/t4013/diff.whatchanged_--root_--patch-with-stat_master deleted file mode 100644 index 9a6cc92ce7..0000000000 --- a/third_party/git/t/t4013/diff.whatchanged_--root_--patch-with-stat_master +++ /dev/null @@ -1,154 +0,0 @@ -$ git whatchanged --root --patch-with-stat master -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 +++ - 3 files changed, 8 insertions(+) - -diff --git a/dir/sub b/dir/sub -new file mode 100644 -index 0000000..35d242b ---- /dev/null -+++ b/dir/sub -@@ -0,0 +1,2 @@ -+A -+B -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file0 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -diff --git a/file2 b/file2 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file2 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -$ diff --git a/third_party/git/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master b/third_party/git/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master deleted file mode 100644 index d1d32bd34c..0000000000 --- a/third_party/git/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master +++ /dev/null @@ -1,199 +0,0 @@ -$ git whatchanged --root -c --patch-with-stat --summary master -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - - dir/sub | 2 ++ - file0 | 3 +++ - 2 files changed, 5 insertions(+) - -diff --combined dir/sub -index cead32e,7289e35..992913c ---- a/dir/sub -+++ b/dir/sub -@@@ -1,6 -1,4 +1,8 @@@ - A - B - +C - +D - +E - +F -+ 1 -+ 2 -diff --combined file0 -index b414108,f4615da..10a8a9f ---- a/file0 -+++ b/file0 -@@@ -1,6 -1,6 +1,9 @@@ - 1 - 2 - 3 - +4 - +5 - +6 -+ A -+ B -+ C - -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - create mode 100644 file1 - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - delete mode 100644 file2 - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 +++ - 3 files changed, 8 insertions(+) - create mode 100644 dir/sub - create mode 100644 file0 - create mode 100644 file2 - -diff --git a/dir/sub b/dir/sub -new file mode 100644 -index 0000000..35d242b ---- /dev/null -+++ b/dir/sub -@@ -0,0 +1,2 @@ -+A -+B -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file0 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -diff --git a/file2 b/file2 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file2 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -$ diff --git a/third_party/git/t/t4013/diff.whatchanged_--root_-p_master b/third_party/git/t/t4013/diff.whatchanged_--root_-p_master deleted file mode 100644 index ebf1f0661e..0000000000 --- a/third_party/git/t/t4013/diff.whatchanged_--root_-p_master +++ /dev/null @@ -1,135 +0,0 @@ -$ git whatchanged --root -p master -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial - -diff --git a/dir/sub b/dir/sub -new file mode 100644 -index 0000000..35d242b ---- /dev/null -+++ b/dir/sub -@@ -0,0 +1,2 @@ -+A -+B -diff --git a/file0 b/file0 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file0 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -diff --git a/file2 b/file2 -new file mode 100644 -index 0000000..01e79c3 ---- /dev/null -+++ b/file2 -@@ -0,0 +1,3 @@ -+1 -+2 -+3 -$ diff --git a/third_party/git/t/t4013/diff.whatchanged_--root_master b/third_party/git/t/t4013/diff.whatchanged_--root_master deleted file mode 100644 index a405cb6138..0000000000 --- a/third_party/git/t/t4013/diff.whatchanged_--root_master +++ /dev/null @@ -1,42 +0,0 @@ -$ git whatchanged --root master -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side - -:100644 100644 35d242b... 7289e35... M dir/sub -:100644 100644 01e79c3... f4615da... M file0 -:000000 100644 0000000... 7289e35... A file3 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -:100644 100644 8422d40... cead32e... M dir/sub -:000000 100644 0000000... b1e6722... A file1 - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. - -:100644 100644 35d242b... 8422d40... M dir/sub -:100644 100644 01e79c3... b414108... M file0 -:100644 000000 01e79c3... 0000000... D file2 - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial - -:000000 100644 0000000... 35d242b... A dir/sub -:000000 100644 0000000... 01e79c3... A file0 -:000000 100644 0000000... 01e79c3... A file2 -$ diff --git a/third_party/git/t/t4013/diff.whatchanged_-SF_-p_master b/third_party/git/t/t4013/diff.whatchanged_-SF_-p_master deleted file mode 100644 index f39da84822..0000000000 --- a/third_party/git/t/t4013/diff.whatchanged_-SF_-p_master +++ /dev/null @@ -1,18 +0,0 @@ -$ git whatchanged -SF -p master -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -$ diff --git a/third_party/git/t/t4013/diff.whatchanged_-SF_master b/third_party/git/t/t4013/diff.whatchanged_-SF_master deleted file mode 100644 index 0499321d0e..0000000000 --- a/third_party/git/t/t4013/diff.whatchanged_-SF_master +++ /dev/null @@ -1,9 +0,0 @@ -$ git whatchanged -SF master -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -:100644 100644 8422d40... cead32e... M dir/sub -$ diff --git a/third_party/git/t/t4013/diff.whatchanged_-p_master b/third_party/git/t/t4013/diff.whatchanged_-p_master deleted file mode 100644 index f18d43209c..0000000000 --- a/third_party/git/t/t4013/diff.whatchanged_-p_master +++ /dev/null @@ -1,102 +0,0 @@ -$ git whatchanged -p master -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 -$ diff --git a/third_party/git/t/t4013/diff.whatchanged_master b/third_party/git/t/t4013/diff.whatchanged_master deleted file mode 100644 index cd3bcc2c72..0000000000 --- a/third_party/git/t/t4013/diff.whatchanged_master +++ /dev/null @@ -1,32 +0,0 @@ -$ git whatchanged master -commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:03:00 2006 +0000 - - Side - -:100644 100644 35d242b... 7289e35... M dir/sub -:100644 100644 01e79c3... f4615da... M file0 -:000000 100644 0000000... 7289e35... A file3 - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -:100644 100644 8422d40... cead32e... M dir/sub -:000000 100644 0000000... b1e6722... A file1 - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. - -:100644 100644 35d242b... 8422d40... M dir/sub -:100644 100644 01e79c3... b414108... M file0 -:100644 000000 01e79c3... 0000000... D file2 -$ |