Subject: Re: [PATCH] submodules: don't stumble over symbolic links when cloning recursively

From: Johannes Sixt <[email-masked]>
Date: Wed, 11 Jul 2012 21:10:28 +0200

Am 11.07.2012 20:11, schrieb Jens Lehmann:
> Since 69c305178 (submodules: refactor computation of relative gitdir path)
> cloning a submodule recursively fails for recursive 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
> work tree and git dir. When a symbolic link in current $PWD points to a
> directory in a different level determining the number of "../" needed to
> traverse to the superprojects 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 the pwd, which fixes this problem.
...
> -	a=$(cd "$gitdir" && pwd)/
> -	b=$(cd "$sm_path" && pwd)/
> +	a=$(cd_to_toplevel && cd "$gitdir" && pwd)/
> +	b=$(cd_to_toplevel && cd "$sm_path" && pwd)/

But if you cd out, how can it be correct not to cd in again if $gitdir
and/or $sm_path are relative?

And if $gitdir and/or $sm_path are absolute, how can the earlier
cd_to_toplevel make a difference?

> +test_expect_success 'submodule update can handle symbolic links in pwd' '

Please add a SYMLINKS prerequisite.

> +	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
> +		)
> +	)
> +'

-- Hannes