kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ps/submodule-sanitize-path-upon-add' into maint 

"git submodule add" failed to squash "path/to/././submodule" to
"path/to/submodule".

* ps/submodule-sanitize-path-upon-add:
  git-submodule.sh: fix '/././' path normalization
maint
Junio C Hamano 2015-03-05 13:13:09 -08:00
parent cbc8d6d8f8 8196e72895
commit 3630be2749
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

@ -423,7 +423,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 &&