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

* jl/submodule-re-add: submodule add: fix breakage when re-adding a deep submodule
2012-02-10 13:59:01 -08:00
parent 38ca63f3c0 1017c1abcb
commit 5febbda4e7
2 changed files with 9 additions and 0 deletions
--- 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