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

git-submodule.sh: fix '/././' path normalization

Browse Source 
When we add a new submodule the path of the submodule is being
normalized. We fail to normalize multiple adjacent '/./', though.
Thus 'path/to/././submodule' will become 'path/to/./submodule' where
it should be 'path/to/submodule' instead.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Acked-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt 2015-01-30 16:14:03 +01:00 committed by Junio C Hamano
parent 3d8a54eb37
commit 8196e72895
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-submodule.sh
View File

@ -420,7 +420,7 @@ cmd_add()
sed -e ' sed -e '
s|//*|/|g s|//*|/|g
s|^\(\./\)*|| s|^\(\./\)*||
s|/\./|/|g s|/\(\./\)*|/|g
:start :start
s|\([^/]*\)/\.\./|| s|\([^/]*\)/\.\./||
tstart tstart

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

@ -171,6 +171,23 @@ test_expect_success 'submodule add with ./ in path' '
test_cmp empty untracked test_cmp empty untracked
' '
test_expect_success 'submodule add with /././ in path' '
echo "refs/heads/master" >expect &&
>empty &&
(
cd addtest &&
git submodule add "$submodurl" dotslashdotsubmod/././frotz/./ &&
git submodule init
) &&
rm -f heads head untracked &&
inspect addtest/dotslashdotsubmod/frotz ../../.. &&
test_cmp expect heads &&
test_cmp expect head &&
test_cmp empty untracked
'
test_expect_success 'submodule add with // in path' ' test_expect_success 'submodule add with // in path' '
echo "refs/heads/master" >expect && echo "refs/heads/master" >expect &&
>empty && >empty &&