Hi again, Ramkumar Ramachandra writes: > +test_expect_success 'malformed instruction sheet 1' ' > + pristine_detach initial && > + test_must_fail git cherry-pick base..anotherpick && > + echo "resolved" >foo && > + git add foo && > + git commit && > + sed "s/pick /pick/" .git/sequencer/todo >new_sheet > + cp new_sheet .git/sequencer/todo > + test_must_fail git cherry-pick --continue > +' Ugh. I forgot to chain using '&&' . > +test_expect_success 'malformed instruction sheet 2' ' > + pristine_detach initial && > + test_must_fail 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_must_fail git cherry-pick --continue > +' Here too. Please squash this in while reading -- thanks :) Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx> diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh index 457ad76..626136a 100755 --- a/t/t3510-cherry-pick-sequence.sh +++ b/t/t3510-cherry-pick-sequence.sh @@ -195,8 +195,8 @@ test_expect_success 'malformed instruction sheet 1' ' echo "resolved" >foo && git add foo && git commit && - sed "s/pick /pick/" .git/sequencer/todo >new_sheet - cp new_sheet .git/sequencer/todo + sed "s/pick /pick/" .git/sequencer/todo >new_sheet && + cp new_sheet .git/sequencer/todo && test_must_fail git cherry-pick --continue ' @@ -206,8 +206,8 @@ test_expect_success 'malformed instruction sheet 2' ' echo "resolved" >foo && git add foo && git commit && - sed "s/pick/revert/" .git/sequencer/todo >new_sheet - cp new_sheet .git/sequencer/todo + sed "s/pick/revert/" .git/sequencer/todo >new_sheet && + cp new_sheet .git/sequencer/todo && test_must_fail git cherry-pick --continue ' -- Ram -- 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