From 6eafa6d096ce6b0ae20e4c0fbb248958559daf64 Mon Sep 17 00:00:00 2001 From: Jens Lehmann Date: Thu, 12 Jul 2012 19:45:32 +0200 Subject: submodules: don't stumble over symbolic links when cloning recursively Since 69c3051 (submodules: refactor computation of relative gitdir path) cloning a submodule recursively fails for nested submodules when a symbolic link is part of the path to the work tree of the superproject. This happens when module_clone() tries to find the relative paths between the work tree and the git dir. When a symbolic link in current $PWD points to a directory that is at a different level, then determining the number of "../" needed to traverse to the superproject's work tree leads to a wrong result. As there is no portable way to say "pwd -P", use cd_to_toplevel to remove the link from $PWD, which fixes this problem. A test for this issue has been added to t7406. Reported-by: Bob Halley Signed-off-by: Jens Lehmann Signed-off-by: Junio C Hamano --- git-submodule.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'git-submodule.sh') diff --git a/git-submodule.sh b/git-submodule.sh index 3d94a1407..61f3b72e3 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -149,8 +149,10 @@ module_clone() die "$(eval_gettext "Clone of '\$url' into submodule path '\$path' failed")" fi - a=$(cd "$gitdir" && pwd)/ - b=$(cd "$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 "$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 -- cgit v1.2.1