Merge branch 'jl/submodule-re-add' into maint

* jl/submodule-re-add: submodule add: fix breakage when re-adding a deep submodule
git-mirror · Feb 10, 2012 · 5febbda · 5febbda
2 parents 38ca63f + 1017c1a
commit 5febbda
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/git-submodule.sh b/git-submodule.sh
@@ -131,6 +131,7 @@ module_clone()
 	gitdir=
 	gitdir_base=
 	name=$(module_name "$path" 2>/dev/null)
+	test -n "$name" || name="$path"
 	base_path=$(dirname "$path")
 
 	gitdir=$(git rev-parse --git-dir)

diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
@@ -611,4 +611,12 @@ test_expect_success 'submodule update places git-dir in superprojects git-dir re
 	)
 '
 
+test_expect_success 'submodule add properly re-creates deeper level submodules' '
+	(cd super &&
+	 git reset --hard master &&
+	 rm -rf deeper/ &&
+	 git submodule add ../submodule deeper/submodule
+	)
+'
+
 test_done