[PATCH 2/2] git submodule: Fix adding of submodules at paths with ./
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Feb 25, 2009, 11:03 UTC
- Message-ID
- <1235559820-3096-3-git-send-email-git@drmicha.warpmail.net>
- In-Reply-To
- <1235559820-3096-2-git-send-email-git@drmicha.warpmail.net>
Make 'git submodule add' strip './' from 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.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> --- git-submodule.sh | 3 +++ t/t7400-submodule-basic.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh index 204aab6..4f26be4 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -167,6 +167,9 @@ cmd_add() ;; esac + # strip superfluous ./ from path + path=$(echo "$path" | sed -e 's|^\(\./\)*||' -e's|/\./|/|g') + # strip trailing slashes from path path=$(echo "$path" | sed -e 's|/*$||') diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index b154050..1757732 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -59,7 +59,7 @@ test_expect_success 'submodule add' ' git submodule init ' -test_expect_failure 'submodule add with ./ in path' ' +test_expect_success 'submodule add with ./ in path' ' git submodule add "$submodurl" ././dotsubmod/./frotz/./ && git submodule init '
-- 1.6.2.rc1.30.gd43c