Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t5526: test recursive submodules when fetching moved submodules
author
Stefan Beller
<sbeller@google.com>
Thu, 14 Jun 2018 17:37:30 +0000
(10:37 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 14 Jun 2018 21:02:24 +0000
(14:02 -0700)
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>
t/t5526-fetch-submodules.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
5fc8475
)
diff --git
a/t/t5526-fetch-submodules.sh
b/t/t5526-fetch-submodules.sh
index 9cc4b569c0566da2f5c2778f404e67e20b29ed06..359e03ff836cf6ac087c83c5b7abe7365ecb4447 100755
(executable)
--- 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 &&
(