diff options
author | Stephen Boyd <bebarino@gmail.com> | 2009-03-22 19:14:05 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-03-22 21:45:19 -0700 |
commit | 108dab2811701c20d6d6e8d9fe8af88e41d65d77 (patch) | |
tree | 7f421f58447ff79392778c433f061d7fcbb91f2a /t/t4013/diff.format-patch_--inline_--stdout_initial..master^^ | |
parent | format-patch: move get_patch_filename() into log-tree (diff) | |
download | tgif-108dab2811701c20d6d6e8d9fe8af88e41d65d77.tar.xz |
format-patch: --attach/inline uses filename instead of SHA1
Currently when format-patch is used with --attach or --inline the patch
attachment has the SHA1 of the commit for its filename. This replaces
the SHA1 with the filename used by format-patch when outputting to
files.
Fix tests relying on the SHA1 output and add a test showing how the
--suffix option affects the attachment filename output.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..master^^')
-rw-r--r-- | t/t4013/diff.format-patch_--inline_--stdout_initial..master^^ | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^ b/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^ index 4f258b8858..29e00ab8af 100644 --- a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^ +++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^ @@ -22,9 +22,9 @@ This is the second commit. --------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff" +Content-Type: text/x-patch; name="0001-Second.patch" Content-Transfer-Encoding: 8bit -Content-Disposition: inline; filename="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff" +Content-Disposition: inline; filename="0001-Second.patch" diff --git a/dir/sub b/dir/sub index 35d242b..8422d40 100644 |