blob: 05df964670f49d011bf35b414177a35f812a4c4e (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
#!/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
|
