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

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 <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-submodule.sh b/git-submodule.sh
index 2f47e065fe8b7ca856f4527d6a507a28f1b2a06b..68d6afd15c94844c2435b65a197d678aa52314c9 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -166,9 +166,18 @@ cmd_add()
        ;;
        esac
 
        ;;
        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"
 
        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
index 132d0b996375ed4b884df36b98a4460d7cc42c58..21c19a28cfdcef1478a97168cae8b6d6cae597a1 100755 (executable)
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -64,7 +64,7 @@ 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/./ &&
        (
                cd addtest &&
                git submodule add "$submodurl" ././dotsubmod/./frotz/./ &&


@@ -72,7 +72,7 @@ test_expect_failure 'submodule add with ./ in path' '
        )
 '
 
        )
 '
 

-test_expect_failure 'submodule add with // in path' '
+test_expect_success 'submodule add with // in path' '

        (
                cd addtest &&
                git submodule add "$submodurl" slashslashsubmod///frotz// &&
        (
                cd addtest &&
                git submodule add "$submodurl" slashslashsubmod///frotz// &&


@@ -80,7 +80,7 @@ test_expect_failure 'submodule add with // in path' '
        )
 '
 
        )
 '
 

-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/.. &&
        (
                cd addtest &&
                git submodule add "$submodurl" dotdotsubmod/../realsubmod/frotz/.. &&


@@ -88,7 +88,7 @@ test_expect_failure 'submodule add with /.. in path' '
        )
 '
 
        )
 '
 

-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//.. &&
        (
                cd addtest &&
                git submodule add "$submodurl" dot/dotslashsubmod/./../..////realsubmod2/a/b/c/d/../../../../frotz//.. &&