diff options
| author | Jens Lehmann <Jens.Lehmann@web.de> | 2012-07-12 19:45:32 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-12 11:14:40 -0700 |
| commit | 6eafa6d096ce6b0ae20e4c0fbb248958559daf64 (patch) | |
| tree | 784da8515b2154a52a07aaa46fd25ad6bc37ad1c | |
| parent | 785ee4960c3d334cbc2b17ab74d2cebdf1b4db64 (diff) | |
| download | git-6eafa6d096ce6b0ae20e4c0fbb248958559daf64.tar.gz git-6eafa6d096ce6b0ae20e4c0fbb248958559daf64.tar.xz | |
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 <halley@play-bow.org>
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-submodule.sh | 6 | ||||
| -rwxr-xr-x | t/t7406-submodule-update.sh | 13 |
2 files changed, 17 insertions, 2 deletions
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 diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index dcb195b4c..ce61d4c0f 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -636,4 +636,17 @@ test_expect_success 'submodule update properly revives a moved submodule' ' ) ' +test_expect_success SYMLINKS 'submodule update can handle symbolic links in pwd' ' + mkdir -p linked/dir && + ln -s linked/dir linkto && + ( + cd linkto && + git clone "$TRASH_DIRECTORY"/super_update_r2 super && + ( + cd super && + git submodule update --init --recursive + ) + ) +' + test_done |