Skip to content

Commit 412a79f

Browse files
committed
Merge branch 'jl/submodule-re-add'
* jl/submodule-re-add: submodule add: fix breakage when re-adding a deep submodule
2 parents 3e9e416 + 1017c1a commit 412a79f

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

git-submodule.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ module_clone()
131131
gitdir=
132132
gitdir_base=
133133
name=$(module_name "$path" 2>/dev/null)
134+
test -n "$name" || name="$path"
134135
base_path=$(dirname "$path")
135136

136137
gitdir=$(git rev-parse --git-dir)

t/t7406-submodule-update.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,4 +611,12 @@ test_expect_success 'submodule update places git-dir in superprojects git-dir re
611611
)
612612
'
613613

614+
test_expect_success 'submodule add properly re-creates deeper level submodules' '
615+
(cd super &&
616+
git reset --hard master &&
617+
rm -rf deeper/ &&
618+
git submodule add ../submodule deeper/submodule
619+
)
620+
'
621+
614622
test_done

0 commit comments

Comments
 (0)