cherry-pick/revert: add --skip option

diff --git a/t/t7412-submodule-absorbgitdirs.sh b/t/t7412-submodule-absorbgitdirs.sh
index ce74c12da2daccd26edbb92070e5ff4eb1f09f9c..1cfa150768d7f813ba9943b4bd17887469cb1c04 100755 (executable)
--- a/t/t7412-submodule-absorbgitdirs.sh
+++ b/t/t7412-submodule-absorbgitdirs.sh
@@ -75,7 +75,12 @@ test_expect_success 're-setup nested submodule' '
        GIT_WORK_TREE=../../../nested git -C sub1/.git/modules/nested config \
                core.worktree "../../../nested" &&
        # make sure this re-setup is correct
-       git status --ignore-submodules=none
+       git status --ignore-submodules=none &&
+
+       # also make sure this old setup does not regress
+       git submodule update --init --recursive >out 2>err &&
+       test_must_be_empty out &&
+       test_must_be_empty err
 '
 
 test_expect_success 'absorb the git dir in a nested submodule' '