diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-22 21:28:26 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-22 21:28:26 +0100 |
| commit | 070f6fed052ca0cf6625f6566d23c71530d7abf9 (patch) | |
| tree | c57a80e0f3dcfee9c129f8a4252c5abb035c9f89 /git-submodule.sh | |
| parent | Merge branch 'ab/merge-file-prefix' (diff) | |
| parent | git-submodule.sh: fix '/././' path normalization (diff) | |
| download | git-070f6fed052ca0cf6625f6566d23c71530d7abf9.tar.xz git-070f6fed052ca0cf6625f6566d23c71530d7abf9.zip | |
Merge branch 'ps/submodule-sanitize-path-upon-add'
"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 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 |