Merge tag 'l10n-2.36.0-rnd2.1' of https://github.com/git-l10n/git-po
[alt-git.git] / t / t3433-rebase-across-mode-change.sh
blob05df964670f49d011bf35b414177a35f812a4c4e
1 #!/bin/sh
3 test_description='git rebase across mode change'
5 . ./test-lib.sh
7 test_expect_success 'setup' '
8 mkdir DS &&
9 >DS/whatever &&
10 git add DS &&
11 git commit -m base &&
13 git branch side1 &&
14 git branch side2 &&
16 git checkout side1 &&
17 git rm -rf DS &&
18 test_ln_s_add unrelated DS &&
19 git commit -m side1 &&
21 git checkout side2 &&
22 >unrelated &&
23 git add unrelated &&
24 git commit -m commit1 &&
26 echo >>unrelated &&
27 git commit -am commit2
30 test_expect_success 'rebase changes with the apply backend' '
31 test_when_finished "git rebase --abort || true" &&
32 git checkout -b apply-backend side2 &&
33 git rebase side1
36 test_expect_success 'rebase changes with the merge backend' '
37 test_when_finished "git rebase --abort || true" &&
38 git checkout -b merge-backend side2 &&
39 git rebase -m side1
42 test_expect_success 'rebase changes with the merge backend with a delay' '
43 test_when_finished "git rebase --abort || true" &&
44 git checkout -b merge-delay-backend side2 &&
45 git rebase -m --exec "sleep 1" side1
48 test_done