format-patch: add --inline option and make --attach a true attachment
The existing --attach option did not create a true "attachment" but multipart/mixed with Content-Disposition: inline. It should have been with Content-Disposition: attachment. Introduce --inline to add multipart/mixed that is inlined, and make --attach to create an attachement. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
3ddad98b74
commit
c112f689c2
@ -9,7 +9,8 @@ git-format-patch - Prepare patches for e-mail submission
|
|||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
[verse]
|
[verse]
|
||||||
'git-format-patch' [-n | -k] [-o <dir> | --stdout] [--attach] [--thread]
|
'git-format-patch' [-n | -k] [-o <dir> | --stdout] [--thread]
|
||||||
|
[--attach[=<boundary>] | --inline[=<boundary>]]
|
||||||
[-s | --signoff] [--diff-options] [--start-number <n>]
|
[-s | --signoff] [--diff-options] [--start-number <n>]
|
||||||
[--in-reply-to=Message-Id] [--suffix=.<sfx>]
|
[--in-reply-to=Message-Id] [--suffix=.<sfx>]
|
||||||
[--ignore-if-in-upstream]
|
[--ignore-if-in-upstream]
|
||||||
@ -68,8 +69,15 @@ OPTIONS
|
|||||||
Print all commits to the standard output in mbox format,
|
Print all commits to the standard output in mbox format,
|
||||||
instead of creating a file for each one.
|
instead of creating a file for each one.
|
||||||
|
|
||||||
--attach::
|
--attach[=<boundary>]::
|
||||||
Create attachments instead of inlining patches.
|
Create multipart/mixed attachment, the first part of
|
||||||
|
which is the commit message and the patch itself in the
|
||||||
|
second part, with "Content-Disposition: attachment".
|
||||||
|
|
||||||
|
--inline[=<boundary>]::
|
||||||
|
Create multipart/mixed attachment, the first part of
|
||||||
|
which is the commit message and the patch itself in the
|
||||||
|
second part, with "Content-Disposition: inline".
|
||||||
|
|
||||||
--thread::
|
--thread::
|
||||||
Add In-Reply-To and References headers to make the second and
|
Add In-Reply-To and References headers to make the second and
|
||||||
|
@ -482,10 +482,22 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
|
|||||||
memcpy(add_signoff, committer, endpos - committer + 1);
|
memcpy(add_signoff, committer, endpos - committer + 1);
|
||||||
add_signoff[endpos - committer + 1] = 0;
|
add_signoff[endpos - committer + 1] = 0;
|
||||||
}
|
}
|
||||||
else if (!strcmp(argv[i], "--attach"))
|
else if (!strcmp(argv[i], "--attach")) {
|
||||||
rev.mime_boundary = git_version_string;
|
rev.mime_boundary = git_version_string;
|
||||||
else if (!prefixcmp(argv[i], "--attach="))
|
rev.no_inline = 1;
|
||||||
|
}
|
||||||
|
else if (!prefixcmp(argv[i], "--attach=")) {
|
||||||
rev.mime_boundary = argv[i] + 9;
|
rev.mime_boundary = argv[i] + 9;
|
||||||
|
rev.no_inline = 1;
|
||||||
|
}
|
||||||
|
else if (!strcmp(argv[i], "--inline")) {
|
||||||
|
rev.mime_boundary = git_version_string;
|
||||||
|
rev.no_inline = 0;
|
||||||
|
}
|
||||||
|
else if (!prefixcmp(argv[i], "--inline=")) {
|
||||||
|
rev.mime_boundary = argv[i] + 9;
|
||||||
|
rev.no_inline = 0;
|
||||||
|
}
|
||||||
else if (!strcmp(argv[i], "--ignore-if-in-upstream"))
|
else if (!strcmp(argv[i], "--ignore-if-in-upstream"))
|
||||||
ignore_if_in_upstream = 1;
|
ignore_if_in_upstream = 1;
|
||||||
else if (!strcmp(argv[i], "--thread"))
|
else if (!strcmp(argv[i], "--thread"))
|
||||||
|
@ -205,10 +205,12 @@ void show_log(struct rev_info *opt, const char *sep)
|
|||||||
"Content-Type: text/x-patch;\n"
|
"Content-Type: text/x-patch;\n"
|
||||||
" name=\"%s.diff\"\n"
|
" name=\"%s.diff\"\n"
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
"Content-Disposition: inline;\n"
|
"Content-Disposition: %s;\n"
|
||||||
" filename=\"%s.diff\"\n\n",
|
" filename=\"%s.diff\"\n\n",
|
||||||
mime_boundary_leader, opt->mime_boundary,
|
mime_boundary_leader, opt->mime_boundary,
|
||||||
sha1, sha1);
|
sha1,
|
||||||
|
opt->no_inline ? "attachment" : "inline",
|
||||||
|
sha1);
|
||||||
opt->diffopt.stat_sep = buffer;
|
opt->diffopt.stat_sep = buffer;
|
||||||
}
|
}
|
||||||
} else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
|
} else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
|
||||||
|
@ -74,6 +74,7 @@ struct rev_info {
|
|||||||
const char *add_signoff;
|
const char *add_signoff;
|
||||||
const char *extra_headers;
|
const char *extra_headers;
|
||||||
const char *log_reencode;
|
const char *log_reencode;
|
||||||
|
int no_inline;
|
||||||
|
|
||||||
/* Filter by commit log message */
|
/* Filter by commit log message */
|
||||||
struct grep_opt *grep_filter;
|
struct grep_opt *grep_filter;
|
||||||
|
@ -238,6 +238,9 @@ format-patch --stdout initial..master
|
|||||||
format-patch --attach --stdout initial..side
|
format-patch --attach --stdout initial..side
|
||||||
format-patch --attach --stdout initial..master^
|
format-patch --attach --stdout initial..master^
|
||||||
format-patch --attach --stdout initial..master
|
format-patch --attach --stdout initial..master
|
||||||
|
format-patch --inline --stdout initial..side
|
||||||
|
format-patch --inline --stdout initial..master^
|
||||||
|
format-patch --inline --stdout initial..master
|
||||||
|
|
||||||
diff --abbrev initial..side
|
diff --abbrev initial..side
|
||||||
diff -r initial..side
|
diff -r initial..side
|
||||||
|
@ -24,7 +24,7 @@ This is the second commit.
|
|||||||
Content-Type: text/x-patch;
|
Content-Type: text/x-patch;
|
||||||
name="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
|
name="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
Content-Disposition: inline;
|
Content-Disposition: attachment;
|
||||||
filename="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
|
filename="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
@ -83,7 +83,7 @@ Content-Transfer-Encoding: 8bit
|
|||||||
Content-Type: text/x-patch;
|
Content-Type: text/x-patch;
|
||||||
name="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
|
name="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
Content-Disposition: inline;
|
Content-Disposition: attachment;
|
||||||
filename="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
|
filename="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
@ -133,7 +133,7 @@ Content-Transfer-Encoding: 8bit
|
|||||||
Content-Type: text/x-patch;
|
Content-Type: text/x-patch;
|
||||||
name="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
|
name="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
Content-Disposition: inline;
|
Content-Disposition: attachment;
|
||||||
filename="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
|
filename="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
@ -24,7 +24,7 @@ This is the second commit.
|
|||||||
Content-Type: text/x-patch;
|
Content-Type: text/x-patch;
|
||||||
name="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
|
name="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
Content-Disposition: inline;
|
Content-Disposition: attachment;
|
||||||
filename="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
|
filename="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
@ -83,7 +83,7 @@ Content-Transfer-Encoding: 8bit
|
|||||||
Content-Type: text/x-patch;
|
Content-Type: text/x-patch;
|
||||||
name="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
|
name="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
Content-Disposition: inline;
|
Content-Disposition: attachment;
|
||||||
filename="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
|
filename="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
@ -22,7 +22,7 @@ Content-Transfer-Encoding: 8bit
|
|||||||
Content-Type: text/x-patch;
|
Content-Type: text/x-patch;
|
||||||
name="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
|
name="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
Content-Disposition: inline;
|
Content-Disposition: attachment;
|
||||||
filename="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
|
filename="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
|
||||||
|
|
||||||
diff --git a/dir/sub b/dir/sub
|
diff --git a/dir/sub b/dir/sub
|
||||||
|
173
t/t4013/diff.format-patch_--inline_--stdout_initial..master
Normal file
173
t/t4013/diff.format-patch_--inline_--stdout_initial..master
Normal file
@ -0,0 +1,173 @@
|
|||||||
|
$ 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] 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="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
Content-Disposition: inline;
|
||||||
|
filename="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.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 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
|
||||||
|
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(-)
|
||||||
|
create mode 100644 file1
|
||||||
|
--------------g-i-t--v-e-r-s-i-o-n
|
||||||
|
Content-Type: text/x-patch;
|
||||||
|
name="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
Content-Disposition: inline;
|
||||||
|
filename="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.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(-)
|
||||||
|
create mode 100644 file3
|
||||||
|
--------------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--
|
||||||
|
|
||||||
|
|
||||||
|
$
|
112
t/t4013/diff.format-patch_--inline_--stdout_initial..master^
Normal file
112
t/t4013/diff.format-patch_--inline_--stdout_initial..master^
Normal file
@ -0,0 +1,112 @@
|
|||||||
|
$ 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] 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="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
Content-Disposition: inline;
|
||||||
|
filename="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.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 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
|
||||||
|
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(-)
|
||||||
|
create mode 100644 file1
|
||||||
|
--------------g-i-t--v-e-r-s-i-o-n
|
||||||
|
Content-Type: text/x-patch;
|
||||||
|
name="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
Content-Disposition: inline;
|
||||||
|
filename="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.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--
|
||||||
|
|
||||||
|
|
||||||
|
$
|
62
t/t4013/diff.format-patch_--inline_--stdout_initial..side
Normal file
62
t/t4013/diff.format-patch_--inline_--stdout_initial..side
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
$ 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(+), 0 deletions(-)
|
||||||
|
create mode 100644 file3
|
||||||
|
--------------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--
|
||||||
|
|
||||||
|
|
||||||
|
$
|
Loading…
Reference in New Issue
Block a user