diff --git a/git-sh-setup.sh b/git-sh-setup.sh index d9fc4be050..b6c55e6dde 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -250,6 +250,8 @@ case $(uname -s) in find () { /usr/bin/find "$@" } + # Let pwd always return the uniqe real windows path + alias pwd='pwd -W' is_absolute_path () { case "$1" in [/\\]* | [A-Za-z]:*) diff --git a/git-submodule.sh b/git-submodule.sh index efb0cfdfe9..08bc48aa50 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -151,9 +151,6 @@ module_clone() a=$(cd "$gitdir" && pwd)/ b=$(cd "$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")"