Merge gitk changes from Paul Mackerras at git://ozlabs.org/~paulus/gitk

[git.git] / git-submodule.sh

diff --git a/git-submodule.sh b/git-submodule.sh
index a9e98224ae1a44013ff56dd6030c1ceb400a8818..efc86ad4e0b90edbbf5a927aa87e7ad4b1a1949e 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -151,6 +151,9 @@ 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")"