diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-05 13:13:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-05 13:13:10 -0800 |
| commit | 3630be2749819b79de917a77c6627e3f84c00a11 (patch) | |
| tree | a2a7fe1e31a4817b0f1b0d8548a6d5c9ed931a20 | |
| parent | cbc8d6d8f8e858072faa2f8fd03d0f255fe0c288 (diff) | |
| parent | 8196e728955a084303e99affff2ebc1120112516 (diff) | |
| download | git-3630be2749819b79de917a77c6627e3f84c00a11.tar.gz | |
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
| -rwxr-xr-x | git-submodule.sh | 2 | ||||
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 9245abfd42..36797c3c00 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -423,7 +423,7 @@ cmd_add() sed -e ' s|//*|/|g s|^\(\./\)*|| - s|/\./|/|g + s|/\(\./\)*|/|g :start s|\([^/]*\)/\.\./|| tstart diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 7c88245031..5811a982f4 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -171,6 +171,23 @@ test_expect_success 'submodule add with ./ in path' ' 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' ' echo "refs/heads/master" >expect && >empty && |