Merge branch 'jl/submodule-re-add'

gitster · gitster · commit 412a79f4cb5e · 2012-01-31T22:01:16.000-08:00
* jl/submodule-re-add:
  submodule add: fix breakage when re-adding a deep submodule
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

Original file line number	Diff line number	Diff line change
`@@ -611,4 +611,12 @@ test_expect_success 'submodule update places git-dir in superprojects git-dir re`
`611`	`611`	`)`
`612`	`612`	`'`
`613`	`613`
	`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`	`+`
`614`	`622`	`test_done`