blob: a2bba04ba96cb5e16dfbecf3f0d6180e150a7ec0 (
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
49
50
51
52
53
54
55
56
57
58
59
60
|
#!/bin/sh
test_description='rebase can handle submodules'
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-submodule-update.sh
. "$TEST_DIRECTORY"/lib-rebase.sh
git_rebase () {
git status -su >expect &&
ls -1pR * >>expect &&
git checkout -b ours HEAD &&
echo x >>file1 &&
git add file1 &&
git commit -m add_x &&
git revert HEAD &&
git status -su >actual &&
ls -1pR * >>actual &&
test_cmp expect actual &&
git rebase "$1"
}
test_submodule_switch "git_rebase"
git_rebase_interactive () {
git status -su >expect &&
ls -1pR * >>expect &&
git checkout -b ours HEAD &&
echo x >>file1 &&
git add file1 &&
git commit -m add_x &&
git revert HEAD &&
git status -su >actual &&
ls -1pR * >>actual &&
test_cmp expect actual &&
set_fake_editor &&
echo "fake-editor.sh" >.git/info/exclude &&
git rebase -i "$1"
}
test_submodule_switch "git_rebase_interactive"
test_expect_success 'rebase interactive ignores modified submodules' '
test_when_finished "rm -rf super sub" &&
git init sub &&
git -C sub commit --allow-empty -m "Initial commit" &&
git init super &&
git -C super submodule add ../sub &&
git -C super config submodule.sub.ignore dirty &&
>super/foo &&
git -C super add foo &&
git -C super commit -m "Initial commit" &&
test_commit -C super a &&
test_commit -C super b &&
test_commit -C super/sub c &&
set_fake_editor &&
git -C super rebase -i HEAD^^
'
test_done
|
