The next patch allows mixing "pick" and "revert" instruction in the same instruction sheet. By removing the "malformed instruction sheet 2" test in advance, it'll be easier to see the changes made by the next patch. Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx> --- t/t3510-cherry-pick-sequence.sh | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-) diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh index 9ffc085..70fd54b 100755 --- a/t/t3510-cherry-pick-sequence.sh +++ b/t/t3510-cherry-pick-sequence.sh @@ -309,7 +309,7 @@ test_expect_success '--signoff is not automatically propagated to resolved confl grep "Signed-off-by:" anotherpick_msg ' -test_expect_success 'malformed instruction sheet 1' ' +test_expect_success 'malformed instruction sheet, action' ' pristine_detach initial && test_expect_code 1 git cherry-pick base..anotherpick && echo "resolved" >foo && @@ -320,18 +320,7 @@ test_expect_success 'malformed instruction sheet 1' ' test_expect_code 128 git cherry-pick --continue ' -test_expect_success 'malformed instruction sheet 2' ' - pristine_detach initial && - test_expect_code 1 git cherry-pick base..anotherpick && - echo "resolved" >foo && - git add foo && - git commit && - sed "s/pick/revert/" .git/sequencer/todo >new_sheet && - cp new_sheet .git/sequencer/todo && - test_expect_code 128 git cherry-pick --continue -' - -test_expect_success 'malformed instruction sheet 3' ' +test_expect_success 'malformed instruction sheet, object name' ' pristine_detach initial && test_expect_code 1 git cherry-pick base..anotherpick && echo "resolved" >foo && -- 1.7.7.3 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html