-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Junio C Hamano <junkio@cox.net>
- Loading branch information
Junio C Hamano
committed
Jun 29, 2006
1 parent
47979d5
commit d410e43
Showing
7 changed files
with
581 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
165 changes: 165 additions & 0 deletions
165
t/t4013/diff.format-patch_--attach_--stdout_initial..master
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,165 @@ | ||
$ git format-patch --attach --stdout initial..master | ||
From 7952a93e09bf565b5592766a438b40cd81f4846f 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 | ||
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 +++ | ||
file2 | 3 --- | ||
3 files changed, 5 insertions(+), 3 deletions(-) | ||
--------------g-i-t--v-e-r-s-i-o-n | ||
Content-Type: text/x-patch; | ||
name="7952a93e09bf565b5592766a438b40cd81f4846f.diff" | ||
Content-Transfer-Encoding: 8bit | ||
Content-Disposition: inline; | ||
filename="7952a93e09bf565b5592766a438b40cd81f4846f.diff" | ||
|
||
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 889b315013ef9f2e2f90aa0b054b267c8a557847 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 | ||
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(+), 0 deletions(-) | ||
--------------g-i-t--v-e-r-s-i-o-n | ||
Content-Type: text/x-patch; | ||
name="889b315013ef9f2e2f90aa0b054b267c8a557847.diff" | ||
Content-Transfer-Encoding: 8bit | ||
Content-Disposition: inline; | ||
filename="889b315013ef9f2e2f90aa0b054b267c8a557847.diff" | ||
|
||
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 | ||
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(+), 0 deletions(-) | ||
--------------g-i-t--v-e-r-s-i-o-n | ||
Content-Type: text/x-patch; | ||
name="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff" | ||
Content-Transfer-Encoding: 8bit | ||
Content-Disposition: inline; | ||
filename="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.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-- | ||
|
||
|
||
$ |
106 changes: 106 additions & 0 deletions
106
t/t4013/diff.format-patch_--attach_--stdout_initial..master^
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,106 @@ | ||
$ git format-patch --attach --stdout initial..master^ | ||
From 7952a93e09bf565b5592766a438b40cd81f4846f 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 | ||
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 +++ | ||
file2 | 3 --- | ||
3 files changed, 5 insertions(+), 3 deletions(-) | ||
--------------g-i-t--v-e-r-s-i-o-n | ||
Content-Type: text/x-patch; | ||
name="7952a93e09bf565b5592766a438b40cd81f4846f.diff" | ||
Content-Transfer-Encoding: 8bit | ||
Content-Disposition: inline; | ||
filename="7952a93e09bf565b5592766a438b40cd81f4846f.diff" | ||
|
||
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 889b315013ef9f2e2f90aa0b054b267c8a557847 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 | ||
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(+), 0 deletions(-) | ||
--------------g-i-t--v-e-r-s-i-o-n | ||
Content-Type: text/x-patch; | ||
name="889b315013ef9f2e2f90aa0b054b267c8a557847.diff" | ||
Content-Transfer-Encoding: 8bit | ||
Content-Disposition: inline; | ||
filename="889b315013ef9f2e2f90aa0b054b267c8a557847.diff" | ||
|
||
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-- | ||
|
||
|
||
$ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
$ 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(+), 0 deletions(-) | ||
--------------g-i-t--v-e-r-s-i-o-n | ||
Content-Type: text/x-patch; | ||
name="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff" | ||
Content-Transfer-Encoding: 8bit | ||
Content-Disposition: inline; | ||
filename="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.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-- | ||
|
||
|
||
$ |
Oops, something went wrong.