diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:55:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:55:18 -0700 |
| commit | 046180ad9dd36f739f22b1d05b17b23b8c96ce49 (patch) | |
| tree | 9dd69596ad88648dc3f5332650011eb2784c09cc /t | |
| parent | d6a58b7773d142ab6da47eca94f83b9c8e6dad5e (diff) | |
| parent | 662cc30cd048f2ccd7ba8d1540e0768ae264c0dd (diff) | |
| download | git-046180ad9dd36f739f22b1d05b17b23b8c96ce49.tar.gz | |
Merge branch 'jk/format-patch-from'
"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^" && |