Re: [PATCH 08/22] sequencer: remove overzealous assumption
From: Jakub Narębski <hidden>
Date: 2016-08-31 13:41:25
W dniu 29.08.2016 o 10:04, Johannes Schindelin pisze:
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.
Actually the question is what does the test that got removed in this commit actually check. Is it high-level sanity check that todo list for git-cherry-pick contains only 'pick', and for git-revert contains only 'revert'? Or does it check that at the low level sequencer fails when instruction sheet includes only identical operations? Only if it is the latter (we are testing too low level details of how sequencer code works, tying too tightly test with implementation) the test should be removed. I see that earlier test check that sequencer handles correctly invalid instructions in todo.
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.
Is it "upcoming work" as in one of the patches in this series? If so, which patch?
quoted hunk ↗ jump to hunk
Signed-off-by: Johannes Schindelin <redacted> --- 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 7b7a89d..6465edf 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' '
Hmmm... the description is somewhat lacking (especially compared to the rest of test), anyway. BTW. we should probably rename 'malformed instruction sheet 2' to 'malformed instruction sheet' if there are no further such tests after this removal, isn't it?
- 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