diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-30 20:04:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-30 20:04:18 (GMT) |
| commit | 8ba105dda861d33f3d7c3b9989592c1605027116 (patch) | |
| tree | 1803040c3b7b69d3d5b9e8453cf79524f11af487 | |
| parent | 80ffb7570f86fb8b671048a374f3c7990c45a27f (diff) | |
| parent | 6eafa6d096ce6b0ae20e4c0fbb248958559daf64 (diff) | |
| download | git-8ba105dda861d33f3d7c3b9989592c1605027116.zip git-8ba105dda861d33f3d7c3b9989592c1605027116.tar.gz git-8ba105dda861d33f3d7c3b9989592c1605027116.tar.bz2 | |
Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' into maint
When "git submodule add" clones a submodule repository, it can get
confused where to store the resulting submodule repository in the
superproject's .git/ directory when there is a symbolic link in the
path to the current directory.
* jl/maint-1.7.10-recurse-submodules-with-symlink:
submodules: don't stumble over symbolic links when cloning recursively
| -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 fbf2faf..30fa93a 100755 --- 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 diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index dcb195b..ce61d4c 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 |