Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' into maint

[thirdparty/git.git] / git-submodule.sh

diff --git a/git-submodule.sh b/git-submodule.sh
index fbf2fafaaf49ec65090ec4eadb33d1ccedc60436..30fa93a8a0a4985f7ce980d4abf69410af22976c 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -150,8 +150,10 @@ module_clone()
                die "$(eval_gettext "Clone of '\$url' into submodule path '\$sm_path' failed")"
        fi
 
-       a=$(cd "$gitdir" && pwd)/
-       b=$(cd "$sm_path" && pwd)/
+       # We already are at the root of the work tree but cd_to_toplevel will
+       # 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