From dd40d1f7b15a693cbf0d941677ef8bae70ccac4b Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 23 Feb 2016 19:21:31 +0100 Subject: [PATCH] sequencer: remove overzealous assumption The sequencer was introduced to make the cherry-pick and revert functionality available as library function, with the original idea being to extend the sequencer to also implement the rebase -i functionality. The test to ensure that all of the commands in the script are identical to the overall operation does not mesh well with that. Therefore let's just get rid of the test that wants to verify that this limitation is still in place, in preparation for the upcoming work to teach the sequencer to do rebase -i's work. Signed-off-by: Johannes Schindelin --- t/t3510-cherry-pick-sequence.sh | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh index 7b7a89dbd5..6465edf989 100755 --- a/t/t3510-cherry-pick-sequence.sh +++ b/t/t3510-cherry-pick-sequence.sh @@ -459,17 +459,6 @@ 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 'empty commit set' ' pristine_detach initial && test_expect_code 128 git cherry-pick base..base