Skip to content

Commit

Permalink
submodule update: add regression test with old style setups
Browse files Browse the repository at this point in the history
As f178c13 (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 f178c13.

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
stefanbeller authored and gitster committed Dec 26, 2018
1 parent b21ebb6 commit 98bf667
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion t/t7412-submodule-absorbgitdirs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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' '
Expand Down

0 comments on commit 98bf667

Please sign in to comment.