diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-05 21:13:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-05 21:13:10 (GMT) |
| commit | 3630be2749819b79de917a77c6627e3f84c00a11 (patch) | |
| tree | a2a7fe1e31a4817b0f1b0d8548a6d5c9ed931a20 /git-submodule.sh | |
| parent | cbc8d6d8f8e858072faa2f8fd03d0f255fe0c288 (diff) | |
| parent | 8196e728955a084303e99affff2ebc1120112516 (diff) | |
| download | git-3630be2749819b79de917a77c6627e3f84c00a11.zip git-3630be2749819b79de917a77c6627e3f84c00a11.tar.gz git-3630be2749819b79de917a77c6627e3f84c00a11.tar.bz2 | |
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
Diffstat (limited to 'git-submodule.sh')
| -rwxr-xr-x | git-submodule.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 9245abf..36797c3 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 |