[PATCH 1/4] submodule update: add regression test with old style setups
- From
Stefan Beller <sbeller@google.com>
- Date
- Dec 14, 2018, 23:59 UTC
- Message-ID
- <20181214235945.41191-2-sbeller@google.com>
- In-Reply-To
- <20181214235945.41191-1-sbeller@google.com>
As f178c13fda (Revert "Merge branch 'sb/submodule-core-worktree'", 2018-09-07) was produced shortly before a release, nobody asked for a regression test to be included. Add a regression test that makes sure that the invocation of `git submodule update` on old setups doesn't produce errors as pointed out in f178c13fda.
The place to add such a regression test may look odd in t7412, but that is the best place as there we setup old style submodule setups explicitly.
Signed-off-by: Stefan Beller <sbeller@google.com> --- t/t7412-submodule-absorbgitdirs.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/t/t7412-submodule-absorbgitdirs.sh b/t/t7412-submodule-absorbgitdirs.sh index ce74c12da2..1cfa150768 100755 --- 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' '
-- 2.20.0.405.gbc1bbc6f85-goog