git submodule: Fix adding of submodules at paths with ./, .. and //

Michael J Gruber · gitster · commit db75ada559dd · 2009-03-03T21:46:09.000-08:00
Make 'git submodule add' normalize the submodule path in the
same way as 'git ls-files' does, so that 'git submodule init' looks up
the information in .gitmodules with the same key under which 'git
submodule add' stores it.

This fixes 4 known breakages.

Signed-off-by: Michael J Gruber &lt;git@drmicha.warpmail.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/git-submodule.sh b/git-submodule.sh
@@ -166,9 +166,18 @@ cmd_add()
 	;;
 	esac
 
-	# strip trailing slashes from path
-	path=$(echo "$path" | sed -e 's|/*$||')
-
+	# normalize path:
+	# multiple //; leading ./; /./; /../; trailing /
+	path=$(printf '%s/\n' "$path" |
+		sed -e '
+			s|//*|/|g
+			s|^\(\./\)*||
+			s|/\./|/|g
+			:start
+			s|\([^/]*\)/\.\./||
+			tstart
+			s|/*$||
+		')
 	git ls-files --error-unmatch "$path" > /dev/null 2>&1 &&
 	die "'$path' already exists in the index"
 
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
@@ -64,31 +64,31 @@ test_expect_success 'submodule add' '
 	)
 '
 
-test_expect_failure 'submodule add with ./ in path' '
+test_expect_success 'submodule add with ./ in path' '
 	(
 		cd addtest &&
 		git submodule add "$submodurl" ././dotsubmod/./frotz/./ &&
 		git submodule init
 	)
 '
 
-test_expect_failure 'submodule add with // in path' '
+test_expect_success 'submodule add with // in path' '
 	(
 		cd addtest &&
 		git submodule add "$submodurl" slashslashsubmod///frotz// &&
 		git submodule init
 	)
 '
 
-test_expect_failure 'submodule add with /.. in path' '
+test_expect_success 'submodule add with /.. in path' '
 	(
 		cd addtest &&
 		git submodule add "$submodurl" dotdotsubmod/../realsubmod/frotz/.. &&
 		git submodule init
 	)
 '
 
-test_expect_failure 'submodule add with ./, /.. and // in path' '
+test_expect_success 'submodule add with ./, /.. and // in path' '
 	(
 		cd addtest &&
 		git submodule add "$submodurl" dot/dotslashsubmod/./../..////realsubmod2/a/b/c/d/../../../../frotz//.. &&

Original file line number	Diff line number	Diff line change
`@@ -64,31 +64,31 @@ test_expect_success 'submodule add' '`
`64`	`64`	`)`
`65`	`65`	`'`
`66`	`66`
`67`		`-test_expect_failure 'submodule add with ./ in path' '`
	`67`	`+test_expect_success 'submodule add with ./ in path' '`
`68`	`68`	`(`
`69`	`69`	`cd addtest &&`
`70`	`70`	`git submodule add "$submodurl" ././dotsubmod/./frotz/./ &&`
`71`	`71`	`git submodule init`
`72`	`72`	`)`
`73`	`73`	`'`
`74`	`74`
`75`		`-test_expect_failure 'submodule add with // in path' '`
	`75`	`+test_expect_success 'submodule add with // in path' '`
`76`	`76`	`(`
`77`	`77`	`cd addtest &&`
`78`	`78`	`git submodule add "$submodurl" slashslashsubmod///frotz// &&`
`79`	`79`	`git submodule init`
`80`	`80`	`)`
`81`	`81`	`'`
`82`	`82`
`83`		`-test_expect_failure 'submodule add with /.. in path' '`
	`83`	`+test_expect_success 'submodule add with /.. in path' '`
`84`	`84`	`(`
`85`	`85`	`cd addtest &&`
`86`	`86`	`git submodule add "$submodurl" dotdotsubmod/../realsubmod/frotz/.. &&`
`87`	`87`	`git submodule init`
`88`	`88`	`)`
`89`	`89`	`'`
`90`	`90`
`91`		`-test_expect_failure 'submodule add with ./, /.. and // in path' '`
	`91`	`+test_expect_success 'submodule add with ./, /.. and // in path' '`
`92`	`92`	`(`
`93`	`93`	`cd addtest &&`
`94`	`94`	`git submodule add "$submodurl" dot/dotslashsubmod/./../..////realsubmod2/a/b/c/d/../../../../frotz//.. &&`