diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-02-12 10:17:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-12 19:27:57 (GMT) |
| commit | 79133a66f79e70dab88f9f0558dd029bf02f2ac9 (patch) | |
| tree | 1ca4f86429cfc66c0f8f9d55864086d05cb2b267 /merge-recursive.c | |
| parent | 33f2f9ab4e5c343b21a9e602456e7facabd609a0 (diff) | |
| download | git-79133a66f79e70dab88f9f0558dd029bf02f2ac9.zip git-79133a66f79e70dab88f9f0558dd029bf02f2ac9.tar.gz git-79133a66f79e70dab88f9f0558dd029bf02f2ac9.tar.bz2 | |
t4014: more tests about appending s-o-b lines
[bc: Squash the tests from Duy's original unify-appending-sob series.
Fix test 90 "signoff: some random signoff-alike" and mark as failing.
Correct behavior should insert a blank line after message body and
signed-off-by.
Add two additional tests:
1. failure to detect non-conforming elements in the footer when last
line matches committer's s-o-b.
2. ensure various s-o-b -like elements in the footer are handled as
conforming. e.g. "Change-id: IXXXX or Bug: 1234"
]
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Brandon Casey <bcasey@nvidia.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions