Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' into maint
commit8ba105dda861d33f3d7c3b9989592c1605027116
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Jul 2012 20:04:18 +0000 (30 13:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Jul 2012 20:04:18 +0000 (30 13:04 -0700)
tree1803040c3b7b69d3d5b9e8453cf79524f11af487
parent80ffb7570f86fb8b671048a374f3c7990c45a27f
parent6eafa6d096ce6b0ae20e4c0fbb248958559daf64
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
git-submodule.sh