diff options
| author | Brandon Casey <drafnel@gmail.com> | 2013-02-12 02:17:35 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-12 11:17:10 -0800 |
| commit | bab4d1097c8be7d688a53b992232063dbf300fd4 (patch) | |
| tree | 0d72cfb6163023a90ae96f009f1a4913335e8727 /t/t3511-cherry-pick-x.sh | |
| parent | b971e04f54e73a5a2af54ad62540273bb90ee7bb (diff) | |
| download | git-bab4d1097c8be7d688a53b992232063dbf300fd4.tar.gz git-bab4d1097c8be7d688a53b992232063dbf300fd4.tar.xz | |
sequencer.c: teach append_signoff how to detect duplicate s-o-b
Teach append_signoff how to detect a duplicate s-o-b in the commit footer.
This is in preparation to unify the append_signoff implementations in
log-tree.c and sequencer.c.
Fixes test in t3511.
Signed-off-by: Brandon Casey <bcasey@nvidia.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3511-cherry-pick-x.sh')
| -rwxr-xr-x | t/t3511-cherry-pick-x.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3511-cherry-pick-x.sh b/t/t3511-cherry-pick-x.sh index a845e45d4..f97727975 100755 --- a/t/t3511-cherry-pick-x.sh +++ b/t/t3511-cherry-pick-x.sh @@ -82,7 +82,7 @@ test_expect_success 'cherry-pick -s inserts blank line after one line subject' ' test_cmp expect actual ' -test_expect_failure 'cherry-pick -s inserts blank line after non-conforming footer' ' +test_expect_success 'cherry-pick -s inserts blank line after non-conforming footer' ' pristine_detach initial && git cherry-pick -s mesg-broken-footer && cat <<-EOF >expect && |