diff options
| author |  Stefan Beller <sbeller@google.com> | 2018-06-14 10:37:30 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-06-14 14:02:24 -0700 |
| commit | c3749f6e597a7b8140181fa5efc95f3f08595f8c (patch) | |
| tree | fbfaff4d1b0630aac4cb371a6fd85de9e2bf8752 /t/t5526-fetch-submodules.sh | |
| parent | submodule: fix NULL correctness in renamed broken submodules (diff) | |
| download | tgif-c3749f6e597a7b8140181fa5efc95f3f08595f8c.tar.xz | |
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 <sbeller@google.com>
Acked-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5526-fetch-submodules.sh')
| -rwxr-xr-x | t/t5526-fetch-submodules.sh | 6 |
1 files changed, 1 insertions, 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 && ( |