Skip to content

Commit 7d9d683

Browse files
committed
sequencer: remove overzealous assumption
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 05a01fa commit 7d9d683

1 file changed

Lines changed: 0 additions & 11 deletions

File tree

t/t3510-cherry-pick-sequence.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -459,17 +459,6 @@ test_expect_success 'malformed instruction sheet 1' '
459459
test_expect_code 128 git cherry-pick --continue
460460
'
461461

462-
test_expect_success 'malformed instruction sheet 2' '
463-
pristine_detach initial &&
464-
test_expect_code 1 git cherry-pick base..anotherpick &&
465-
echo "resolved" >foo &&
466-
git add foo &&
467-
git commit &&
468-
sed "s/pick/revert/" .git/sequencer/todo >new_sheet &&
469-
cp new_sheet .git/sequencer/todo &&
470-
test_expect_code 128 git cherry-pick --continue
471-
'
472-
473462
test_expect_success 'empty commit set' '
474463
pristine_detach initial &&
475464
test_expect_code 128 git cherry-pick base..base

0 commit comments

Comments
 (0)