@@ -34,6 +34,9 @@ test_expect_success 'setup: create origin repos' '
3434 cd "${base_path}"
3535'
3636# 2
37+ # add submodule with default config (ignore=none) and
38+ # check log that is contains a path entry for the submodule 'sub'
39+ # change the commit in the submodule and check that 'git status' shows it as modified
3740test_expect_success ' main: add submodule with default config' '
3841 cd "${base_path}" &&
3942 cd main &&
@@ -46,6 +49,7 @@ test_expect_success 'main: add submodule with default config' '
4649'
4750
4851# 3
52+ # change the submodule config to ignore=all and check that status and log do not show changes
4953test_expect_success ' main: submodule config ignore=all' '
5054 cd "${base_path}" &&
5155 cd main &&
@@ -57,6 +61,8 @@ test_expect_success 'main: submodule config ignore=all' '
5761 echo
5862'
5963# 4
64+ # change the commit in the submodule and check that 'git status' does not show it as modified
65+ # but 'git status --ignore-submodules=none' does show it as modified
6066test_expect_success ' sub: change to different sha1 and check status in main' '
6167 cd "${base_path}" &&
6268 cd main &&
@@ -67,6 +73,7 @@ test_expect_success 'sub: change to different sha1 and check status in main' '
6773'
6874
6975# 5
76+ # check that normal 'git add' does not stage the change in the submodule
7077test_expect_success ' main: check normal add and status' '
7178 cd "${base_path}" &&
7279 cd main &&
@@ -76,6 +83,10 @@ test_expect_success 'main: check normal add and status' '
7683'
7784
7885# 6
86+ # check that 'git add --force' does stage the change in the submodule
87+ # and that 'git status' does show it as modified
88+ # check that 'git log --ignore-submodules=none' shows the submodule change
89+ # in the log
7990test_expect_success ' main: check force add and status' '
8091 cd "${base_path}" &&
8192 cd main &&
0 commit comments