diff options
Diffstat (limited to 'third_party/git/t/t3403-rebase-skip.sh')
| -rwxr-xr-x | third_party/git/t/t3403-rebase-skip.sh | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/third_party/git/t/t3403-rebase-skip.sh b/third_party/git/t/t3403-rebase-skip.sh index ee8a8dba52..1f5122b632 100755 --- a/third_party/git/t/t3403-rebase-skip.sh +++ b/third_party/git/t/t3403-rebase-skip.sh @@ -7,8 +7,6 @@ test_description='git rebase --merge --skip tests' . ./test-lib.sh -. "$TEST_DIRECTORY"/lib-rebase.sh - # we assume the default git am -3 --skip strategy is tested independently # and always works :) @@ -22,13 +20,6 @@ test_expect_success setup ' git commit -a -m "hello world" && echo goodbye >> hello && git commit -a -m "goodbye" && - git tag goodbye && - - git checkout --detach && - git checkout HEAD^ . && - test_tick && - git commit -m reverted-goodbye && - git tag reverted-goodbye && git checkout -f skip-reference && echo moo > hello && @@ -85,27 +76,4 @@ test_expect_success 'moved back to branch correctly' ' test_debug 'gitk --all & sleep 1' -test_expect_success 'fixup that empties commit fails' ' - test_when_finished "git rebase --abort" && - ( - set_fake_editor && - test_must_fail env FAKE_LINES="1 fixup 2" git rebase -i \ - goodbye^ reverted-goodbye - ) -' - -test_expect_success 'squash that empties commit fails' ' - test_when_finished "git rebase --abort" && - ( - set_fake_editor && - test_must_fail env FAKE_LINES="1 squash 2" git rebase -i \ - goodbye^ reverted-goodbye - ) -' - -# Must be the last test in this file -test_expect_success '$EDITOR and friends are unchanged' ' - test_editor_unchanged -' - test_done |