diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-28 21:18:43 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-28 21:18:43 +0400 |
| commit | da212eabec969f0a45475b6a962b06c103a3ec65 (patch) | |
| tree | 30ba87a33028ff84b6a2c6ba61a60e8bb4788ed4 /t | |
| parent | 77bc4302dc93ac33891c72df59d9426eb6d06d0b (diff) | |
| parent | 662cc30cd048f2ccd7ba8d1540e0768ae264c0dd (diff) | |
Merge branch 'jk/format-patch-from' into maint
"format-patch --from=<whom>" forgot to omit unnecessary in-body from
line, i.e. when <whom> is the same as the real author.
* jk/format-patch-from:
format-patch: print in-body "From" only when needed
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4014-format-patch.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 668933bfb2..8f272bce84 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -1000,6 +1000,16 @@ test_expect_success '--from uses committer ident' ' test_cmp expect patch.head ' +test_expect_success '--from omits redundant in-body header' ' + git format-patch -1 --stdout --from="A U Thor <author@example.com>" >patch && + cat >expect <<-\EOF && + From: A U Thor <author@example.com> + + EOF + sed -ne "/^From:/p; /^$/p; /^---$/q" <patch >patch.head && + test_cmp expect patch.head +' + test_expect_success 'in-body headers trigger content encoding' ' GIT_AUTHOR_NAME="éxötìc" test_commit exotic && test_when_finished "git reset --hard HEAD^" && |