diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-22 12:55:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-22 12:55:48 -0700 |
| commit | 15b3c82cbb345c890400119134fb9709790696d8 (patch) | |
| tree | 8afe28b48bb2f23dd5b0d364b186a102ae73b0dd /git-submodule.sh | |
| parent | 9cbd27b19a2df0484fb1f3a4a227abdbeab3c23d (diff) | |
| parent | 6eafa6d096ce6b0ae20e4c0fbb248958559daf64 (diff) | |
| download | git-15b3c82cbb345c890400119134fb9709790696d8.tar.gz | |
Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink'
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
Diffstat (limited to 'git-submodule.sh')
| -rwxr-xr-x | git-submodule.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 5629d875e6..dba4d39e1f 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -186,8 +186,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 |