diff options
Diffstat (limited to 'third_party/git/t/t3433-rebase-across-mode-change.sh')
-rwxr-xr-x | third_party/git/t/t3433-rebase-across-mode-change.sh | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/third_party/git/t/t3433-rebase-across-mode-change.sh b/third_party/git/t/t3433-rebase-across-mode-change.sh deleted file mode 100755 index 05df964670f4..000000000000 --- a/third_party/git/t/t3433-rebase-across-mode-change.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -test_description='git rebase across mode change' - -. ./test-lib.sh - -test_expect_success 'setup' ' - mkdir DS && - >DS/whatever && - git add DS && - git commit -m base && - - git branch side1 && - git branch side2 && - - git checkout side1 && - git rm -rf DS && - test_ln_s_add unrelated DS && - git commit -m side1 && - - git checkout side2 && - >unrelated && - git add unrelated && - git commit -m commit1 && - - echo >>unrelated && - git commit -am commit2 -' - -test_expect_success 'rebase changes with the apply backend' ' - test_when_finished "git rebase --abort || true" && - git checkout -b apply-backend side2 && - git rebase side1 -' - -test_expect_success 'rebase changes with the merge backend' ' - test_when_finished "git rebase --abort || true" && - git checkout -b merge-backend side2 && - git rebase -m side1 -' - -test_expect_success 'rebase changes with the merge backend with a delay' ' - test_when_finished "git rebase --abort || true" && - git checkout -b merge-delay-backend side2 && - git rebase -m --exec "sleep 1" side1 -' - -test_done |