diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-06 22:26:38 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-06 22:26:38 +0400 |
| commit | ee8213951a36cefabed7dd653965cffb6aee628e (patch) | |
| tree | bb19072f2b71c4bbcfb2a5cabd6dd61775f272e7 /git-submodule.sh | |
| parent | c7be99ea51db5944e46b5a5c3ef9a396fa307e2d (diff) | |
| parent | 0170a3c6ee7eba128d44dd50d0bf7a86d295c19e (diff) | |
Merge branch 'sk/submodules-absolute-path-on-windows'
* sk/submodules-absolute-path-on-windows:
Revert "submodules: fix ambiguous absolute paths under Windows"
Diffstat (limited to 'git-submodule.sh')
| -rwxr-xr-x | git-submodule.sh | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index b55d83ac46..e146b833d1 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -291,9 +291,6 @@ module_clone() # resolve any symlinks that might be present in $PWD a=$(cd_to_toplevel && cd "$gitdir" && pwd)/ b=$(cd_to_toplevel && cd "$sm_path" && pwd)/ - # normalize Windows-style absolute paths to POSIX-style absolute paths - case $a in [a-zA-Z]:/*) a=/${a%%:*}${a#*:} ;; esac - case $b in [a-zA-Z]:/*) b=/${b%%:*}${b#*:} ;; esac # Remove all common leading directories after a sanity check if test "${a#$b}" != "$a" || test "${b#$a}" != "$b"; then die "$(eval_gettext "Gitdir '\$a' is part of the submodule path '\$b' or vice versa")" |