undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Michael J Gruber 2009-03-03 16:08:21 +01:00 committed by Junio C Hamano
parent ac8463d2b4
commit db75ada559
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
git-submodule.sh
View File

@ -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"

8
t/t7400-submodule-basic.sh
View File

@ -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/./ &&
@ -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// &&
@ -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/.. &&
@ -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//.. &&