commit doc: document that -c, -C, -F and --fixup with -m error
[git.git] / t / t2013-checkout-submodule.sh
blob6ef15738e44ed8ad82960c042b3212fce266ec93
1 #!/bin/sh
3 test_description='checkout can handle submodules'
5 . ./test-lib.sh
6 . "$TEST_DIRECTORY"/lib-submodule-update.sh
8 test_expect_success 'setup' '
9 mkdir submodule &&
10 (cd submodule &&
11 git init &&
12 test_commit first) &&
13 git add submodule &&
14 test_tick &&
15 git commit -m superproject &&
16 (cd submodule &&
17 test_commit second) &&
18 git add submodule &&
19 test_tick &&
20 git commit -m updated.superproject
23 test_expect_success '"reset <submodule>" updates the index' '
24 git update-index --refresh &&
25 git diff-files --quiet &&
26 git diff-index --quiet --cached HEAD &&
27 git reset HEAD^ submodule &&
28 test_must_fail git diff-files --quiet &&
29 git reset submodule &&
30 git diff-files --quiet
33 test_expect_success '"checkout <submodule>" updates the index only' '
34 git update-index --refresh &&
35 git diff-files --quiet &&
36 git diff-index --quiet --cached HEAD &&
37 git checkout HEAD^ submodule &&
38 test_must_fail git diff-files --quiet &&
39 git checkout HEAD submodule &&
40 git diff-files --quiet
43 test_expect_success '"checkout <submodule>" honors diff.ignoreSubmodules' '
44 git config diff.ignoreSubmodules dirty &&
45 echo x> submodule/untracked &&
46 git checkout HEAD >actual 2>&1 &&
47 ! test -s actual
50 test_expect_success '"checkout <submodule>" honors submodule.*.ignore from .gitmodules' '
51 git config diff.ignoreSubmodules none &&
52 git config -f .gitmodules submodule.submodule.path submodule &&
53 git config -f .gitmodules submodule.submodule.ignore untracked &&
54 git checkout HEAD >actual 2>&1 &&
55 ! test -s actual
58 test_expect_success '"checkout <submodule>" honors submodule.*.ignore from .git/config' '
59 git config -f .gitmodules submodule.submodule.ignore none &&
60 git config submodule.submodule.path submodule &&
61 git config submodule.submodule.ignore all &&
62 git checkout HEAD >actual 2>&1 &&
63 ! test -s actual
66 KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
67 test_submodule_switch_recursing_with_args "checkout"
69 test_submodule_forced_switch_recursing_with_args "checkout -f"
71 test_submodule_switch "git checkout"
73 test_submodule_forced_switch "git checkout -f"
75 test_done