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-various.sh | |
| parent | 6fa8e6278b210bfa56fcb54ed38d2b485350e7c6 (diff) | |
| download | git-108dab2811701c20d6d6e8d9fe8af88e41d65d77.tar.gz git-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-various.sh')
| -rwxr-xr-x | t/t4013-diff-various.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 426e64e82..6592a4f29 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -246,6 +246,7 @@ format-patch --stdout initial..master format-patch --stdout --no-numbered initial..master format-patch --stdout --numbered initial..master format-patch --attach --stdout initial..side +format-patch --attach --stdout --suffix=.diff initial..side format-patch --attach --stdout initial..master^ format-patch --attach --stdout initial..master format-patch --inline --stdout initial..side |