From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Jul 2012 19:55:47 +0000 (-0700)
Subject: Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink'
X-Git-Tag: v1.7.12-rc0~19
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/15b3c82cbb345c890400119134fb9709790696d8?ds=inline;hp=-c

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
---

15b3c82cbb345c890400119134fb9709790696d8
diff --combined git-submodule.sh
index 5629d875e6,61f3b72e32..dba4d39e1f
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@@ -1,6 -1,6 +1,6 @@@
  #!/bin/sh
  #
 -# git-submodules.sh: add, init, update or list git submodules
 +# git-submodule.sh: add, init, update or list git submodules
  #
  # Copyright (c) 2007 Lars Hjemli
  
@@@ -30,22 -30,7 +30,22 @@@ nofetch
  update=
  prefix=
  
 -# Resolve relative url by appending to parent's url
 +# The function takes at most 2 arguments. The first argument is the
 +# URL that navigates to the submodule origin repo. When relative, this URL
 +# is relative to the superproject origin URL repo. The second up_path
 +# argument, if specified, is the relative path that navigates
 +# from the submodule working tree to the superproject working tree.
 +#
 +# The output of the function is the origin URL of the submodule.
 +#
 +# The output will either be an absolute URL or filesystem path (if the
 +# superproject origin URL is an absolute URL or filesystem path,
 +# respectively) or a relative file system path (if the superproject
 +# origin URL is a relative file system path).
 +#
 +# When the output is a relative file system path, the path is either
 +# relative to the submodule working tree, if up_path is specified, or to
 +# the superproject working tree otherwise.
  resolve_relative_url ()
  {
  	remote=$(get_default_remote)
@@@ -54,21 -39,6 +54,21 @@@
  	url="$1"
  	remoteurl=${remoteurl%/}
  	sep=/
 +	up_path="$2"
 +
 +	case "$remoteurl" in
 +	*:*|/*)
 +		is_relative=
 +		;;
 +	./*|../*)
 +		is_relative=t
 +		;;
 +	*)
 +		is_relative=t
 +		remoteurl="./$remoteurl"
 +		;;
 +	esac
 +
  	while test -n "$url"
  	do
  		case "$url" in
@@@ -83,12 -53,7 +83,12 @@@
  				sep=:
  				;;
  			*)
 -				die "$(eval_gettext "cannot strip one component off url '\$remoteurl'")"
 +				if test -z "$is_relative" || test "." = "$remoteurl"
 +				then
 +					die "$(eval_gettext "cannot strip one component off url '\$remoteurl'")"
 +				else
 +					remoteurl=.
 +				fi
  				;;
  			esac
  			;;
@@@ -99,8 -64,7 +99,8 @@@
  			break;;
  		esac
  	done
 -	echo "$remoteurl$sep${url%/}"
 +	remoteurl="$remoteurl$sep${url%/}"
 +	echo "${is_relative:+${up_path}}${remoteurl#./}"
  }
  
  #
@@@ -137,12 -101,11 +137,12 @@@ module_list(
  module_name()
  {
  	# Do we have "submodule.<something>.path = $1" defined in .gitmodules file?
 +	sm_path="$1"
  	re=$(printf '%s\n' "$1" | sed -e 's/[].[^$\\*]/\\&/g')
  	name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
  		sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' )
  	test -z "$name" &&
 -	die "$(eval_gettext "No submodule mapping found in .gitmodules for path '\$path'")"
 +	die "$(eval_gettext "No submodule mapping found in .gitmodules for path '\$sm_path'")"
  	echo "$name"
  }
  
@@@ -156,7 -119,7 +156,7 @@@
  #
  module_clone()
  {
 -	path=$1
 +	sm_path=$1
  	url=$2
  	reference="$3"
  	quiet=
@@@ -167,8 -130,8 +167,8 @@@
  
  	gitdir=
  	gitdir_base=
 -	name=$(module_name "$path" 2>/dev/null)
 -	test -n "$name" || name="$path"
 +	name=$(module_name "$sm_path" 2>/dev/null)
 +	test -n "$name" || name="$sm_path"
  	base_name=$(dirname "$name")
  
  	gitdir=$(git rev-parse --git-dir)
@@@ -177,17 -140,19 +177,19 @@@
  
  	if test -d "$gitdir"
  	then
 -		mkdir -p "$path"
 +		mkdir -p "$sm_path"
  		rm -f "$gitdir/index"
  	else
  		mkdir -p "$gitdir_base"
  		git clone $quiet -n ${reference:+"$reference"} \
 -			--separate-git-dir "$gitdir" "$url" "$path" ||
 -		die "$(eval_gettext "Clone of '\$url' into submodule path '\$path' failed")"
 +			--separate-git-dir "$gitdir" "$url" "$sm_path" ||
 +		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 "$path" && 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
@@@ -206,10 -171,10 +208,10 @@@
  
  	# Turn each leading "*/" component into "../"
  	rel=$(echo $b | sed -e 's|[^/][^/]*|..|g')
 -	echo "gitdir: $rel/$a" >"$path/.git"
 +	echo "gitdir: $rel/$a" >"$sm_path/.git"
  
  	rel=$(echo $a | sed -e 's|[^/][^/]*|..|g')
 -	(clear_local_git_env; cd "$path" && GIT_WORK_TREE=. git config core.worktree "$rel/$b")
 +	(clear_local_git_env; cd "$sm_path" && GIT_WORK_TREE=. git config core.worktree "$rel/$b")
  }
  
  #
@@@ -260,14 -225,14 +262,14 @@@ cmd_add(
  	done
  
  	repo=$1
 -	path=$2
 +	sm_path=$2
  
 -	if test -z "$path"; then
 -		path=$(echo "$repo" |
 +	if test -z "$sm_path"; then
 +		sm_path=$(echo "$repo" |
  			sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g')
  	fi
  
 -	if test -z "$repo" -o -z "$path"; then
 +	if test -z "$repo" -o -z "$sm_path"; then
  		usage
  	fi
  
@@@ -288,7 -253,7 +290,7 @@@
  
  	# normalize path:
  	# multiple //; leading ./; /./; /../; trailing /
 -	path=$(printf '%s/\n' "$path" |
 +	sm_path=$(printf '%s/\n' "$sm_path" |
  		sed -e '
  			s|//*|/|g
  			s|^\(\./\)*||
@@@ -298,49 -263,49 +300,49 @@@
  			tstart
  			s|/*$||
  		')
 -	git ls-files --error-unmatch "$path" > /dev/null 2>&1 &&
 -	die "$(eval_gettext "'\$path' already exists in the index")"
 +	git ls-files --error-unmatch "$sm_path" > /dev/null 2>&1 &&
 +	die "$(eval_gettext "'\$sm_path' already exists in the index")"
  
 -	if test -z "$force" && ! git add --dry-run --ignore-missing "$path" > /dev/null 2>&1
 +	if test -z "$force" && ! git add --dry-run --ignore-missing "$sm_path" > /dev/null 2>&1
  	then
  		eval_gettextln "The following path is ignored by one of your .gitignore files:
 -\$path
 +\$sm_path
  Use -f if you really want to add it." >&2
  		exit 1
  	fi
  
  	# perhaps the path exists and is already a git repo, else clone it
 -	if test -e "$path"
 +	if test -e "$sm_path"
  	then
 -		if test -d "$path"/.git -o -f "$path"/.git
 +		if test -d "$sm_path"/.git -o -f "$sm_path"/.git
  		then
 -			eval_gettextln "Adding existing repo at '\$path' to the index"
 +			eval_gettextln "Adding existing repo at '\$sm_path' to the index"
  		else
 -			die "$(eval_gettext "'\$path' already exists and is not a valid git repo")"
 +			die "$(eval_gettext "'\$sm_path' already exists and is not a valid git repo")"
  		fi
  
  	else
  
 -		module_clone "$path" "$realrepo" "$reference" || exit
 +		module_clone "$sm_path" "$realrepo" "$reference" || exit
  		(
  			clear_local_git_env
 -			cd "$path" &&
 +			cd "$sm_path" &&
  			# ash fails to wordsplit ${branch:+-b "$branch"...}
  			case "$branch" in
  			'') git checkout -f -q ;;
  			?*) git checkout -f -q -B "$branch" "origin/$branch" ;;
  			esac
 -		) || die "$(eval_gettext "Unable to checkout submodule '\$path'")"
 +		) || die "$(eval_gettext "Unable to checkout submodule '\$sm_path'")"
  	fi
 -	git config submodule."$path".url "$realrepo"
 +	git config submodule."$sm_path".url "$realrepo"
  
 -	git add $force "$path" ||
 -	die "$(eval_gettext "Failed to add submodule '\$path'")"
 +	git add $force "$sm_path" ||
 +	die "$(eval_gettext "Failed to add submodule '\$sm_path'")"
  
 -	git config -f .gitmodules submodule."$path".path "$path" &&
 -	git config -f .gitmodules submodule."$path".url "$repo" &&
 +	git config -f .gitmodules submodule."$sm_path".path "$sm_path" &&
 +	git config -f .gitmodules submodule."$sm_path".url "$repo" &&
  	git add --force .gitmodules ||
 -	die "$(eval_gettext "Failed to register submodule '\$path'")"
 +	die "$(eval_gettext "Failed to register submodule '\$sm_path'")"
  }
  
  #
@@@ -378,25 -343,23 +380,25 @@@ cmd_foreach(
  	exec 3<&0
  
  	module_list |
 -	while read mode sha1 stage path
 +	while read mode sha1 stage sm_path
  	do
 -		if test -e "$path"/.git
 +		if test -e "$sm_path"/.git
  		then
 -			say "$(eval_gettext "Entering '\$prefix\$path'")"
 -			name=$(module_name "$path")
 +			say "$(eval_gettext "Entering '\$prefix\$sm_path'")"
 +			name=$(module_name "$sm_path")
  			(
 -				prefix="$prefix$path/"
 +				prefix="$prefix$sm_path/"
  				clear_local_git_env
 -				cd "$path" &&
 +				# we make $path available to scripts ...
 +				path=$sm_path
 +				cd "$sm_path" &&
  				eval "$@" &&
  				if test -n "$recursive"
  				then
  					cmd_foreach "--recursive" "$@"
  				fi
  			) <&3 3<&- ||
 -			die "$(eval_gettext "Stopping at '\$path'; script returned non-zero status.")"
 +			die "$(eval_gettext "Stopping at '\$sm_path'; script returned non-zero status.")"
  		fi
  	done
  }
@@@ -430,16 -393,15 +432,16 @@@ cmd_init(
  	done
  
  	module_list "$@" |
 -	while read mode sha1 stage path
 +	while read mode sha1 stage sm_path
  	do
 -		# Skip already registered paths
 -		name=$(module_name "$path") || exit
 +		name=$(module_name "$sm_path") || exit
 +
 +		# Copy url setting when it is not set yet
  		if test -z "$(git config "submodule.$name.url")"
  		then
  			url=$(git config -f .gitmodules submodule."$name".url)
  			test -z "$url" &&
 -			die "$(eval_gettext "No url found for submodule path '\$path' in .gitmodules")"
 +			die "$(eval_gettext "No url found for submodule path '\$sm_path' in .gitmodules")"
  
  			# Possibly a url relative to parent
  			case "$url" in
@@@ -448,9 -410,7 +450,9 @@@
  				;;
  			esac
  			git config submodule."$name".url "$url" ||
 -			die "$(eval_gettext "Failed to register url for submodule path '\$path'")"
 +			die "$(eval_gettext "Failed to register url for submodule path '\$sm_path'")"
 +
 +			say "$(eval_gettext "Submodule '\$name' (\$url) registered for path '\$sm_path'")"
  		fi
  
  		# Copy "update" setting when it is not set yet
@@@ -458,7 -418,9 +460,7 @@@
  		test -z "$upd" ||
  		test -n "$(git config submodule."$name".update)" ||
  		git config submodule."$name".update "$upd" ||
 -		die "$(eval_gettext "Failed to register update mode for submodule path '\$path'")"
 -
 -		say "$(eval_gettext "Submodule '\$name' (\$url) registered for path '\$path'")"
 +		die "$(eval_gettext "Failed to register update mode for submodule path '\$sm_path'")"
  	done
  }
  
@@@ -530,14 -492,14 +532,14 @@@ cmd_update(
  	cloned_modules=
  	module_list "$@" | {
  	err=
 -	while read mode sha1 stage path
 +	while read mode sha1 stage sm_path
  	do
  		if test "$stage" = U
  		then
 -			echo >&2 "Skipping unmerged submodule $path"
 +			echo >&2 "Skipping unmerged submodule $sm_path"
  			continue
  		fi
 -		name=$(module_name "$path") || exit
 +		name=$(module_name "$sm_path") || exit
  		url=$(git config submodule."$name".url)
  		if ! test -z "$update"
  		then
@@@ -548,7 -510,7 +550,7 @@@
  
  		if test "$update_module" = "none"
  		then
 -			echo "Skipping submodule '$path'"
 +			echo "Skipping submodule '$sm_path'"
  			continue
  		fi
  
@@@ -557,20 -519,20 +559,20 @@@
  			# Only mention uninitialized submodules when its
  			# path have been specified
  			test "$#" != "0" &&
 -			say "$(eval_gettext "Submodule path '\$path' not initialized
 +			say "$(eval_gettext "Submodule path '\$sm_path' not initialized
  Maybe you want to use 'update --init'?")"
  			continue
  		fi
  
 -		if ! test -d "$path"/.git -o -f "$path"/.git
 +		if ! test -d "$sm_path"/.git -o -f "$sm_path"/.git
  		then
 -			module_clone "$path" "$url" "$reference"|| exit
 +			module_clone "$sm_path" "$url" "$reference"|| exit
  			cloned_modules="$cloned_modules;$name"
  			subsha1=
  		else
 -			subsha1=$(clear_local_git_env; cd "$path" &&
 +			subsha1=$(clear_local_git_env; cd "$sm_path" &&
  				git rev-parse --verify HEAD) ||
 -			die "$(eval_gettext "Unable to find current revision in submodule path '\$path'")"
 +			die "$(eval_gettext "Unable to find current revision in submodule path '\$sm_path'")"
  		fi
  
  		if test "$subsha1" != "$sha1"
@@@ -586,10 -548,10 +588,10 @@@
  			then
  				# Run fetch only if $sha1 isn't present or it
  				# is not reachable from a ref.
 -				(clear_local_git_env; cd "$path" &&
 +				(clear_local_git_env; cd "$sm_path" &&
  					( (rev=$(git rev-list -n 1 $sha1 --not --all 2>/dev/null) &&
  					 test -z "$rev") || git-fetch)) ||
 -				die "$(eval_gettext "Unable to fetch in submodule path '\$path'")"
 +				die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")"
  			fi
  
  			# Is this something we just cloned?
@@@ -603,24 -565,24 +605,24 @@@
  			case "$update_module" in
  			rebase)
  				command="git rebase"
 -				die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$path'")"
 -				say_msg="$(eval_gettext "Submodule path '\$path': rebased into '\$sha1'")"
 +				die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$sm_path'")"
 +				say_msg="$(eval_gettext "Submodule path '\$sm_path': rebased into '\$sha1'")"
  				must_die_on_failure=yes
  				;;
  			merge)
  				command="git merge"
 -				die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$path'")"
 -				say_msg="$(eval_gettext "Submodule path '\$path': merged in '\$sha1'")"
 +				die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$sm_path'")"
 +				say_msg="$(eval_gettext "Submodule path '\$sm_path': merged in '\$sha1'")"
  				must_die_on_failure=yes
  				;;
  			*)
  				command="git checkout $subforce -q"
 -				die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$path'")"
 -				say_msg="$(eval_gettext "Submodule path '\$path': checked out '\$sha1'")"
 +				die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$sm_path'")"
 +				say_msg="$(eval_gettext "Submodule path '\$sm_path': checked out '\$sha1'")"
  				;;
  			esac
  
 -			if (clear_local_git_env; cd "$path" && $command "$sha1")
 +			if (clear_local_git_env; cd "$sm_path" && $command "$sha1")
  			then
  				say "$say_msg"
  			elif test -n "$must_die_on_failure"
@@@ -634,11 -596,11 +636,11 @@@
  
  		if test -n "$recursive"
  		then
 -			(clear_local_git_env; cd "$path" && eval cmd_update "$orig_flags")
 +			(clear_local_git_env; cd "$sm_path" && eval cmd_update "$orig_flags")
  			res=$?
  			if test $res -gt 0
  			then
 -				die_msg="$(eval_gettext "Failed to recurse into submodule path '\$path'")"
 +				die_msg="$(eval_gettext "Failed to recurse into submodule path '\$sm_path'")"
  				if test $res -eq 1
  				then
  					err="${err};$die_msg"
@@@ -925,30 -887,30 +927,30 @@@ cmd_status(
  	done
  
  	module_list "$@" |
 -	while read mode sha1 stage path
 +	while read mode sha1 stage sm_path
  	do
 -		name=$(module_name "$path") || exit
 +		name=$(module_name "$sm_path") || exit
  		url=$(git config submodule."$name".url)
 -		displaypath="$prefix$path"
 +		displaypath="$prefix$sm_path"
  		if test "$stage" = U
  		then
  			say "U$sha1 $displaypath"
  			continue
  		fi
 -		if test -z "$url" || ! test -d "$path"/.git -o -f "$path"/.git
 +		if test -z "$url" || ! test -d "$sm_path"/.git -o -f "$sm_path"/.git
  		then
  			say "-$sha1 $displaypath"
  			continue;
  		fi
 -		set_name_rev "$path" "$sha1"
 -		if git diff-files --ignore-submodules=dirty --quiet -- "$path"
 +		set_name_rev "$sm_path" "$sha1"
 +		if git diff-files --ignore-submodules=dirty --quiet -- "$sm_path"
  		then
  			say " $sha1 $displaypath$revname"
  		else
  			if test -z "$cached"
  			then
 -				sha1=$(clear_local_git_env; cd "$path" && git rev-parse --verify HEAD)
 -				set_name_rev "$path" "$sha1"
 +				sha1=$(clear_local_git_env; cd "$sm_path" && git rev-parse --verify HEAD)
 +				set_name_rev "$sm_path" "$sha1"
  			fi
  			say "+$sha1 $displaypath$revname"
  		fi
@@@ -958,10 -920,10 +960,10 @@@
  			(
  				prefix="$displaypath/"
  				clear_local_git_env
 -				cd "$path" &&
 +				cd "$sm_path" &&
  				eval cmd_status "$orig_args"
  			) ||
 -			die "$(eval_gettext "Failed to recurse into submodule path '\$path'")"
 +			die "$(eval_gettext "Failed to recurse into submodule path '\$sm_path'")"
  		fi
  	done
  }
@@@ -993,42 -955,30 +995,42 @@@ cmd_sync(
  	done
  	cd_to_toplevel
  	module_list "$@" |
 -	while read mode sha1 stage path
 +	while read mode sha1 stage sm_path
  	do
 -		name=$(module_name "$path")
 +		name=$(module_name "$sm_path")
  		url=$(git config -f .gitmodules --get submodule."$name".url)
  
  		# Possibly a url relative to parent
  		case "$url" in
  		./*|../*)
 -			url=$(resolve_relative_url "$url") || exit
 +			# rewrite foo/bar as ../.. to find path from
 +			# submodule work tree to superproject work tree
 +			up_path="$(echo "$sm_path" | sed "s/[^/][^/]*/../g")" &&
 +			# guarantee a trailing /
 +			up_path=${up_path%/}/ &&
 +			# path from submodule work tree to submodule origin repo
 +			sub_origin_url=$(resolve_relative_url "$url" "$up_path") &&
 +			# path from superproject work tree to submodule origin repo
 +			super_config_url=$(resolve_relative_url "$url") || exit
 +			;;
 +		*)
 +			sub_origin_url="$url"
 +			super_config_url="$url"
  			;;
  		esac
  
  		if git config "submodule.$name.url" >/dev/null 2>/dev/null
  		then
  			say "$(eval_gettext "Synchronizing submodule url for '\$name'")"
 -			git config submodule."$name".url "$url"
 +			git config submodule."$name".url "$super_config_url"
  
 -			if test -e "$path"/.git
 +			if test -e "$sm_path"/.git
  			then
  			(
  				clear_local_git_env
 -				cd "$path"
 +				cd "$sm_path"
  				remote=$(get_default_remote)
 -				git config remote."$remote".url "$url"
 +				git config remote."$remote".url "$sub_origin_url"
  			)
  			fi
  		fi