Skip to content

Commit

Permalink
t5526: test recursive submodules when fetching moved submodules
Browse files Browse the repository at this point in the history
The topic merged in 0c7ecb7 (Merge branch 'sb/submodule-move-nested',
2018-05-08) provided support for moving nested submodules.

Remove the NEEDSWORK comment and implement the nested submodules test as
the comment hinted at.

Signed-off-by: Stefan Beller <sbeller@google.com>
Acked-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
stefanbeller authored and gitster committed Jun 14, 2018
1 parent 5fc8475 commit c3749f6
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions t/t5526-fetch-submodules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -574,11 +574,7 @@ test_expect_success "fetch new commits when submodule got renamed" '
git clone . downstream_rename &&
(
cd downstream_rename &&
git submodule update --init &&
# NEEDSWORK: we omitted --recursive for the submodule update here since
# that does not work. See test 7001 for mv "moving nested submodules"
# for details. Once that is fixed we should add the --recursive option
# here.
git submodule update --init --recursive &&
git checkout -b rename &&
git mv submodule submodule_renamed &&
(
Expand Down

0 comments on commit c3749f6

Please sign in to comment.