maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Squashed 'third_party/git/' content from commit cb71568594

Browse source 
git-subtree-dir: third_party/git
git-subtree-split: cb715685942260375e1eb8153b0768a376e4ece7
This commit is contained in:
Vincent Ambo 2020-01-11 23:36:56 +00:00
commit 1b593e1ea4
3629 changed files with 1139935 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
t/t4013/diff.config_format.subjectprefix_DIFFERENT_PREFIX Normal file
View file

@ -0,0 +1,2 @@
$ git config format.subjectprefix DIFFERENT_PREFIX
$

34
t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master Normal file
View file

@ -0,0 +1,34 @@
$ 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
$

39
t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_side Normal file
View file

@ -0,0 +1,39 @@
$ 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
$

34
t/t4013/diff.diff-tree_--cc_--patch-with-stat_master Normal file
View file

@ -0,0 +1,34 @@
$ 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
$

4
t/t4013/diff.diff-tree_--cc_--shortstat_master Normal file
View file

@ -0,0 +1,4 @@
$ git diff-tree --cc --shortstat master
59d314ad6f356dd08601a4cd5e530381da3e3c64
2 files changed, 5 insertions(+)
$

6
t/t4013/diff.diff-tree_--cc_--stat_--summary_master Normal file
View file

@ -0,0 +1,6 @@
$ git diff-tree --cc --stat --summary master
59d314ad6f356dd08601a4cd5e530381da3e3c64
dir/sub | 2 ++
file0 | 3 +++
2 files changed, 5 insertions(+)
$

8
t/t4013/diff.diff-tree_--cc_--stat_--summary_side Normal file
View file

@ -0,0 +1,8 @@
$ git diff-tree --cc --stat --summary side
c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
dir/sub | 2 ++
file0 | 3 +++
file3 | 4 ++++
3 files changed, 9 insertions(+)
create mode 100644 file3
$

6
t/t4013/diff.diff-tree_--cc_--stat_master Normal file
View file

@ -0,0 +1,6 @@
$ git diff-tree --cc --stat master
59d314ad6f356dd08601a4cd5e530381da3e3c64
dir/sub | 2 ++
file0 | 3 +++
2 files changed, 5 insertions(+)
$

6
t/t4013/diff.diff-tree_--cc_--summary_REVERSE Normal file
View file

@ -0,0 +1,6 @@
$ git diff-tree --cc --summary REVERSE
2562325a7ee916efb2481da93073b82cec801cbc
create mode 100644 file1
delete mode 100644 file2
delete mode 100644 file3
$

30
t/t4013/diff.diff-tree_--cc_master Normal file
View file

@ -0,0 +1,30 @@
$ 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
$

2
t/t4013/diff.diff-tree_--patch-with-raw_initial Normal file
View file

@ -0,0 +1,2 @@
$ git diff-tree --patch-with-raw initial
$

2
t/t4013/diff.diff-tree_--patch-with-stat_initial Normal file
View file

@ -0,0 +1,2 @@
$ git diff-tree --patch-with-stat initial
$

2
t/t4013/diff.diff-tree_--pretty=oneline_--patch-with-raw_initial Normal file
View file

@ -0,0 +1,2 @@
$ git diff-tree --pretty=oneline --patch-with-raw initial
$

2
t/t4013/diff.diff-tree_--pretty=oneline_--patch-with-stat_initial Normal file
View file

@ -0,0 +1,2 @@
$ git diff-tree --pretty=oneline --patch-with-stat initial
$

33
t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-raw_initial Normal file
View file

@ -0,0 +1,33 @@
$ 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
$

34
t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-stat_initial Normal file
View file

@ -0,0 +1,34 @@
$ 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
$

29
t/t4013/diff.diff-tree_--pretty=oneline_--root_-p_initial Normal file
View file

@ -0,0 +1,29 @@
$ 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
$

6
t/t4013/diff.diff-tree_--pretty=oneline_--root_initial Normal file
View file

@ -0,0 +1,6 @@
$ 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
$

2
t/t4013/diff.diff-tree_--pretty=oneline_-p_initial Normal file
View file

@ -0,0 +1,2 @@
$ git diff-tree --pretty=oneline -p initial
$

2
t/t4013/diff.diff-tree_--pretty=oneline_initial Normal file
View file

@ -0,0 +1,2 @@
$ git diff-tree --pretty=oneline initial
$

2
t/t4013/diff.diff-tree_--pretty_--patch-with-raw_initial Normal file
View file

@ -0,0 +1,2 @@
$ git diff-tree --pretty --patch-with-raw initial
$

2
t/t4013/diff.diff-tree_--pretty_--patch-with-stat_initial Normal file
View file

@ -0,0 +1,2 @@
$ git diff-tree --pretty --patch-with-stat initial
$

43
t/t4013/diff.diff-tree_--pretty_--patch-with-stat_side Normal file
View file

@ -0,0 +1,43 @@
$ 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
$

38
t/t4013/diff.diff-tree_--pretty_--root_--patch-with-raw_initial Normal file
View file

@ -0,0 +1,38 @@
$ 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
$

39
t/t4013/diff.diff-tree_--pretty_--root_--patch-with-stat_initial Normal file
View file

@ -0,0 +1,39 @@
$ 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
$

12
t/t4013/diff.diff-tree_--pretty_--root_--stat_--compact-summary_initial Normal file
View file

@ -0,0 +1,12 @@
$ 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(+)
$

15
t/t4013/diff.diff-tree_--pretty_--root_--stat_--summary_initial Normal file
View file

@ -0,0 +1,15 @@
$ 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
$

12
t/t4013/diff.diff-tree_--pretty_--root_--stat_initial Normal file
View file

@ -0,0 +1,12 @@
$ 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(+)
$

11
t/t4013/diff.diff-tree_--pretty_--root_--summary_-r_initial Normal file
View file

@ -0,0 +1,11 @@
$ 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
$

11
t/t4013/diff.diff-tree_--pretty_--root_--summary_initial Normal file
View file

@ -0,0 +1,11 @@
$ 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
$

34
t/t4013/diff.diff-tree_--pretty_--root_-p_initial Normal file
View file

@ -0,0 +1,34 @@
$ 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
$

11
t/t4013/diff.diff-tree_--pretty_--root_initial Normal file
View file

@ -0,0 +1,11 @@
$ 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
$

2
t/t4013/diff.diff-tree_--pretty_--stat_--summary_initial Normal file
View file

@ -0,0 +1,2 @@
$ git diff-tree --pretty --stat --summary initial
$

2
t/t4013/diff.diff-tree_--pretty_--stat_initial Normal file
View file

@ -0,0 +1,2 @@
$ git diff-tree --pretty --stat initial
$

2
t/t4013/diff.diff-tree_--pretty_--summary_initial Normal file
View file

@ -0,0 +1,2 @@
$ git diff-tree --pretty --summary initial
$

12
t/t4013/diff.diff-tree_--pretty_-R_--root_--stat_--compact-summary_initial Normal file
View file

@ -0,0 +1,12 @@
$ 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(-)
$

2
t/t4013/diff.diff-tree_--pretty_-p_initial Normal file
View file

@ -0,0 +1,2 @@
$ git diff-tree --pretty -p initial
$

38
t/t4013/diff.diff-tree_--pretty_-p_side Normal file
View file

@ -0,0 +1,38 @@
$ 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
$

2
t/t4013/diff.diff-tree_--pretty_initial Normal file
View file

@ -0,0 +1,2 @@
$ git diff-tree --pretty initial
$

11
t/t4013/diff.diff-tree_--pretty_side Normal file
View file

@ -0,0 +1,11 @@
$ 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
$

6
t/t4013/diff.diff-tree_--root_--abbrev_initial Normal file
View file

@ -0,0 +1,6 @@
$ 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
$

33
t/t4013/diff.diff-tree_--root_--patch-with-raw_initial Normal file
View file

@ -0,0 +1,33 @@
$ 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
$

34
t/t4013/diff.diff-tree_--root_--patch-with-stat_initial Normal file
View file

@ -0,0 +1,34 @@
$ 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
$

29
t/t4013/diff.diff-tree_--root_-p_initial Normal file
View file

@ -0,0 +1,29 @@
$ 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
$

6
t/t4013/diff.diff-tree_--root_-r_--abbrev=4_initial Normal file
View file

@ -0,0 +1,6 @@
$ 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
$

6
t/t4013/diff.diff-tree_--root_-r_--abbrev_initial Normal file
View file

@ -0,0 +1,6 @@
$ 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
$

6
t/t4013/diff.diff-tree_--root_-r_initial Normal file
View file

@ -0,0 +1,6 @@
$ 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
$

6
t/t4013/diff.diff-tree_--root_initial Normal file
View file

@ -0,0 +1,6 @@
$ git diff-tree --root initial
444ac553ac7612cc88969031b02b3767fb8a353a
:000000 040000 0000000000000000000000000000000000000000 da7a33fa77d8066d6698643940ce5860fe2d7fb3 A dir
:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file0
:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file2
$

4
t/t4013/diff.diff-tree_--stat_--compact-summary_initial_mode Normal file
View file

@ -0,0 +1,4 @@
$ git diff-tree --stat --compact-summary initial mode
file0 (mode +x) | 0
1 file changed, 0 insertions(+), 0 deletions(-)
$

4
t/t4013/diff.diff-tree_--stat_initial_mode Normal file
View file

@ -0,0 +1,4 @@
$ git diff-tree --stat initial mode
file0 | 0
1 file changed, 0 insertions(+), 0 deletions(-)
$

3
t/t4013/diff.diff-tree_--summary_initial_mode Normal file
View file

@ -0,0 +1,3 @@
$ git diff-tree --summary initial mode
mode change 100644 => 100755 file0
$

4
t/t4013/diff.diff-tree_-R_--stat_--compact-summary_initial_mode Normal file
View file

@ -0,0 +1,4 @@
$ git diff-tree -R --stat --compact-summary initial mode
file0 (mode -x) | 0
1 file changed, 0 insertions(+), 0 deletions(-)
$

5
t/t4013/diff.diff-tree_-c_--abbrev_master Normal file
View file

@ -0,0 +1,5 @@
$ git diff-tree -c --abbrev master
59d314ad6f356dd08601a4cd5e530381da3e3c64
::100644 100644 100644 cead32e... 7289e35... 992913c... MM dir/sub
::100644 100644 100644 b414108... f4615da... 10a8a9f... MM file0
$

6
t/t4013/diff.diff-tree_-c_--stat_--summary_master Normal file
View file

@ -0,0 +1,6 @@
$ git diff-tree -c --stat --summary master
59d314ad6f356dd08601a4cd5e530381da3e3c64
dir/sub | 2 ++
file0 | 3 +++
2 files changed, 5 insertions(+)
$

8
t/t4013/diff.diff-tree_-c_--stat_--summary_side Normal file
View file

@ -0,0 +1,8 @@
$ git diff-tree -c --stat --summary side
c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
dir/sub | 2 ++
file0 | 3 +++
file3 | 4 ++++
3 files changed, 9 insertions(+)
create mode 100644 file3
$

6
t/t4013/diff.diff-tree_-c_--stat_master Normal file
View file

@ -0,0 +1,6 @@
$ git diff-tree -c --stat master
59d314ad6f356dd08601a4cd5e530381da3e3c64
dir/sub | 2 ++
file0 | 3 +++
2 files changed, 5 insertions(+)
$

5
t/t4013/diff.diff-tree_-c_master Normal file
View file

@ -0,0 +1,5 @@
$ git diff-tree -c master
59d314ad6f356dd08601a4cd5e530381da3e3c64
::100644 100644 100644 cead32e925b1420c84c14cbf7cf755e7e45af8ad 7289e35bff32727c08dda207511bec138fdb9ea5 992913c5aa0a5476d10c49ed0f21fc0c6d1aedf3 MM dir/sub
::100644 100644 100644 b414108e81e5091fe0974a1858b4d0d22b107f70 f4615da674c09df322d6ba8d6b21ecfb1b1ba510 10a8a9f3657f91a156b9f0184ed79a20adef9f7f MM file0
$

80
t/t4013/diff.diff-tree_-p_-m_master Normal file
View file

@ -0,0 +1,80 @@
$ 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
$

2
t/t4013/diff.diff-tree_-p_initial Normal file
View file

@ -0,0 +1,2 @@
$ git diff-tree -p initial
$

2
t/t4013/diff.diff-tree_-p_master Normal file
View file

@ -0,0 +1,2 @@
$ git diff-tree -p master
$

2
t/t4013/diff.diff-tree_-r_--abbrev=4_initial Normal file
View file

@ -0,0 +1,2 @@
$ git diff-tree -r --abbrev=4 initial
$

2
t/t4013/diff.diff-tree_-r_--abbrev_initial Normal file
View file

@ -0,0 +1,2 @@
$ git diff-tree -r --abbrev initial
$

2
t/t4013/diff.diff-tree_-r_initial Normal file
View file

@ -0,0 +1,2 @@
$ git diff-tree -r initial
$

2
t/t4013/diff.diff-tree_initial Normal file
View file

@ -0,0 +1,2 @@
$ git diff-tree initial
$

3
t/t4013/diff.diff-tree_initial_mode Normal file
View file

@ -0,0 +1,3 @@
$ git diff-tree initial mode
:100644 100755 01e79c32a8c99c557f0757da7cb6d65b3414466d 01e79c32a8c99c557f0757da7cb6d65b3414466d M file0
$

2
t/t4013/diff.diff-tree_master Normal file
View file

@ -0,0 +1,2 @@
$ git diff-tree master
$

32
t/t4013/diff.diff_--abbrev_initial..side Normal file
View file

@ -0,0 +1,32 @@
$ 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
$

38
t/t4013/diff.diff_--cached Normal file
View file

@ -0,0 +1,38 @@
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

15
t/t4013/diff.diff_--cached_--_file0 Normal file
View file

@ -0,0 +1,15 @@
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

3
t/t4013/diff.diff_--dirstat-by-file_initial_rearrange Normal file
View file

@ -0,0 +1,3 @@
$ git diff --dirstat-by-file initial rearrange
100.0% dir/
$

3
t/t4013/diff.diff_--dirstat_--cc_master~1_master Normal file
View file

@ -0,0 +1,3 @@
$ git diff --dirstat --cc master~1 master
40.0% dir/
$

3
t/t4013/diff.diff_--dirstat_initial_rearrange Normal file
View file

@ -0,0 +1,3 @@
$ git diff --dirstat initial rearrange
100.0% dir/
$

3
t/t4013/diff.diff_--dirstat_master~1_master~2 Normal file
View file

@ -0,0 +1,3 @@
$ git diff --dirstat master~1 master~2
40.0% dir/
$

29
t/t4013/diff.diff_--line-prefix=abc_master_master^_side Normal file
View file

@ -0,0 +1,29 @@
$ 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
$

15
t/t4013/diff.diff_--line-prefix_--cached_--_file0 Normal file
View file

@ -0,0 +1,15 @@
| | | 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

2
t/t4013/diff.diff_--name-status_dir2_dir Normal file
View file

@ -0,0 +1,2 @@
$ git diff --name-status dir2 dir
$

3
t/t4013/diff.diff_--no-index_--name-status_--_dir2_dir Normal file
View file

@ -0,0 +1,3 @@
$ git diff --no-index --name-status -- dir2 dir
A dir/sub
$

3
t/t4013/diff.diff_--no-index_--name-status_dir2_dir Normal file
View file

@ -0,0 +1,3 @@
$ git diff --no-index --name-status dir2 dir
A dir/sub
$

3
t/t4013/diff.diff_--no-index_--raw_--abbrev=4_dir2_dir Normal file
View file

@ -0,0 +1,3 @@
$ git diff --no-index --raw --abbrev=4 dir2 dir
:000000 100644 0000... 0000... A dir/sub
$

3
t/t4013/diff.diff_--no-index_--raw_--no-abbrev_dir2_dir Normal file
View file

@ -0,0 +1,3 @@
$ git diff --no-index --raw --no-abbrev dir2 dir
:000000 100644 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 A dir/sub
$

3
t/t4013/diff.diff_--no-index_--raw_dir2_dir Normal file
View file

@ -0,0 +1,3 @@
$ git diff --no-index --raw dir2 dir
:000000 100644 0000000... 0000000... A dir/sub
$

2
t/t4013/diff.diff_--no-index_dir_dir3 Normal file
View file

@ -0,0 +1,2 @@
$ git diff --no-index dir dir3
$

36
t/t4013/diff.diff_--patch-with-raw_-r_initial..side Normal file
View file

@ -0,0 +1,36 @@
$ 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
$

36
t/t4013/diff.diff_--patch-with-raw_initial..side Normal file
View file

@ -0,0 +1,36 @@
$ 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
$

37
t/t4013/diff.diff_--patch-with-stat_-r_initial..side Normal file
View file

@ -0,0 +1,37 @@
$ 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
$

37
t/t4013/diff.diff_--patch-with-stat_initial..side Normal file
View file

@ -0,0 +1,37 @@
$ 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
$

6
t/t4013/diff.diff_--raw_--abbrev=4_initial Normal file
View file

@ -0,0 +1,6 @@
$ 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
$

6
t/t4013/diff.diff_--raw_--no-abbrev_initial Normal file
View file

@ -0,0 +1,6 @@
$ 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
$

6
t/t4013/diff.diff_--raw_initial Normal file
View file

@ -0,0 +1,6 @@
$ 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
$

6
t/t4013/diff.diff_--stat_initial..side Normal file
View file

@ -0,0 +1,6 @@
$ git diff --stat initial..side
dir/sub | 2 ++
file0 | 3 +++
file3 | 4 ++++
3 files changed, 9 insertions(+)
$

29
t/t4013/diff.diff_-U1_initial..side Normal file
View file

@ -0,0 +1,29 @@
$ 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
$

31
t/t4013/diff.diff_-U2_initial..side Normal file
View file

@ -0,0 +1,31 @@
$ 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
$

32
t/t4013/diff.diff_-U_initial..side Normal file
View file

@ -0,0 +1,32 @@
$ 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
$

6
t/t4013/diff.diff_-r_--stat_initial..side Normal file
View file

@ -0,0 +1,6 @@
$ git diff -r --stat initial..side
dir/sub | 2 ++
file0 | 3 +++
file3 | 4 ++++
3 files changed, 9 insertions(+)
$

32
t/t4013/diff.diff_-r_initial..side Normal file
View file

@ -0,0 +1,32 @@
$ 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
$

32
t/t4013/diff.diff_initial..side Normal file
View file

@ -0,0 +1,32 @@
$ 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
$

29
t/t4013/diff.diff_master_master^_side Normal file
View file

@ -0,0 +1,29 @@
$ 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
$

61
t/t4013/diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side Normal file
View file

@ -0,0 +1,61 @@
$ 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--
$

170
t/t4013/diff.format-patch_--attach_--stdout_initial..master Normal file
View file

@ -0,0 +1,170 @@
$ 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--
$

110
t/t4013/diff.format-patch_--attach_--stdout_initial..master^ Normal file
View file

@ -0,0 +1,110 @@
$ 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--
$

Some files were not shown because too many files have changed in this diff Show more