From c3749f6e597a7b8140181fa5efc95f3f08595f8c Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Thu, 14 Jun 2018 10:37:30 -0700 Subject: [PATCH] t5526: test recursive submodules when fetching moved submodules The topic merged in 0c7ecb7c311 (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 Acked-by: Heiko Voigt Signed-off-by: Junio C Hamano --- t/t5526-fetch-submodules.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh index 9cc4b569c0..359e03ff83 100755 --- a/t/t5526-fetch-submodules.sh +++ b/t/t5526-fetch-submodules.sh @@ -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 && (