mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
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>
This commit is contained in:
parent
ac8463d2b4
commit
db75ada559
|
@ -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"
|
||||
|
||||
|
|
|
@ -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//.. &&
|
||||
|
|
Loading…
Reference in a new issue