From e90b9c2eb9580f45d77d3849e5f14406bb76efcd Mon Sep 17 00:00:00 2001
From: Karsten Blees <blees@dcon.de>
Date: Mon, 9 Jan 2012 19:16:30 +0100
Subject: [PATCH] Windows/i18n: rename $path to prevent clashes with $PATH

Environment variables on Windows are case-insensitive. Rename '$path' in
all calls to eval_gettext to $modulepath so that it is not mistakenly
expanded to the value of the $PATH variable.

[jes: this happens to fix t7406/t7407 on Windows]
[pt: squashed in fix for substitution order error that broke t7400]

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---
 git-submodule.sh | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/git-submodule.sh b/git-submodule.sh
index 05286ff400..8f67e7f5fe 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -105,7 +105,7 @@ module_name()
 	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 "$(modulepath=$path eval_gettext "No submodule mapping found in .gitmodules for path '\$modulepath'")"
 	echo "$name"
 }
 
@@ -170,7 +170,7 @@ module_clone()
 		else
 			git-clone $quiet -n "$url" "$path" --separate-git-dir "$gitdir"
 		fi ||
-		die "$(eval_gettext "Clone of '\$url' into submodule path '\$path' failed")"
+		die "$(modulepath=$path eval_gettext "Clone of '\$url' into submodule path '\$modulepath' failed")"
 	fi
 }
 
@@ -261,13 +261,13 @@ cmd_add()
 			s|/*$||
 		')
 	git ls-files --error-unmatch "$path" > /dev/null 2>&1 &&
-	die "$(eval_gettext "'\$path' already exists in the index")"
+	die "$(modulepath=$path eval_gettext "'\$modulepath' already exists in the index")"
 
 	if test -z "$force" && ! git add --dry-run --ignore-missing "$path" > /dev/null 2>&1
 	then
 		cat >&2 <<EOF
 The following path is ignored by one of your .gitignore files:
-$(eval_gettextln $path)
+$(modulepath=$path eval_gettextln "\$modulepath")
 Use -f if you really want to add it.
 EOF
 		exit 1
@@ -278,9 +278,9 @@ EOF
 	then
 		if test -d "$path"/.git -o -f "$path"/.git
 		then
-			eval_gettextln "Adding existing repo at '\$path' to the index"
+			modulepath=$path eval_gettextln "Adding existing repo at '\$modulepath' to the index"
 		else
-			die "$(eval_gettext "'\$path' already exists and is not a valid git repo")"
+			die "$(modulepath=$path eval_gettext "'\$modulepath' already exists and is not a valid git repo")"
 		fi
 
 	else
@@ -294,17 +294,17 @@ EOF
 			'') git checkout -f -q ;;
 			?*) git checkout -f -q -B "$branch" "origin/$branch" ;;
 			esac
-		) || die "$(eval_gettext "Unable to checkout submodule '\$path'")"
+		) || die "$(modulepath=$path eval_gettext "Unable to checkout submodule '\$modulepath'")"
 	fi
 	git config submodule."$path".url "$realrepo"
 
 	git add $force "$path" ||
-	die "$(eval_gettext "Failed to add submodule '\$path'")"
+	die "$(modulepath=$path eval_gettext "Failed to add submodule '\$modulepath'")"
 
 	git config -f .gitmodules submodule."$path".path "$path" &&
 	git config -f .gitmodules submodule."$path".url "$repo" &&
 	git add --force .gitmodules ||
-	die "$(eval_gettext "Failed to register submodule '\$path'")"
+	die "$(modulepath=$path eval_gettext "Failed to register submodule '\$modulepath'")"
 }
 
 #
@@ -346,7 +346,7 @@ cmd_foreach()
 	do
 		if test -e "$path"/.git
 		then
-			say "$(eval_gettext "Entering '\$prefix\$path'")"
+			say "$(modulepath=$path eval_gettext "Entering '\$prefix\$modulepath'")"
 			name=$(module_name "$path")
 			(
 				prefix="$prefix$path/"
@@ -358,7 +358,7 @@ cmd_foreach()
 					cmd_foreach "--recursive" "$@"
 				fi
 			) <&3 3<&- ||
-			die "$(eval_gettext "Stopping at '\$path'; script returned non-zero status.")"
+			die "$(modulepath=$path eval_gettext "Stopping at '\$modulepath'; script returned non-zero status.")"
 		fi
 	done
 }
@@ -400,7 +400,7 @@ cmd_init()
 		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 "$(modulepath=$path eval_gettext "No url found for submodule path '\$modulepath' in .gitmodules")"
 
 			# Possibly a url relative to parent
 			case "$url" in
@@ -409,7 +409,7 @@ cmd_init()
 				;;
 			esac
 			git config submodule."$name".url "$url" ||
-			die "$(eval_gettext "Failed to register url for submodule path '\$path'")"
+			die "$(modulepath=$path eval_gettext "Failed to register url for submodule path '\$modulepath'")"
 		fi
 
 		# Copy "update" setting when it is not set yet
@@ -417,9 +417,9 @@ cmd_init()
 		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'")"
+		die "$(modulepath=$path eval_gettext "Failed to register update mode for submodule path '\$modulepath'")"
 
-		say "$(eval_gettext "Submodule '\$name' (\$url) registered for path '\$path'")"
+		say "$(modulepath=$path eval_gettext "Submodule '\$name' (\$url) registered for path '\$modulepath'")"
 	done
 }
 
@@ -518,7 +518,7 @@ cmd_update()
 			# Only mention uninitialized submodules when its
 			# path have been specified
 			test "$#" != "0" &&
-			say "$(eval_gettext "Submodule path '\$path' not initialized
+			say "$(modulepath=$path eval_gettext "Submodule path '\$modulepath' not initialized
 Maybe you want to use 'update --init'?")"
 			continue
 		fi
@@ -531,7 +531,7 @@ Maybe you want to use 'update --init'?")"
 		else
 			subsha1=$(clear_local_git_env; cd "$path" &&
 				git rev-parse --verify HEAD) ||
-			die "$(eval_gettext "Unable to find current revision in submodule path '\$path'")"
+			die "$(modulepath=$path eval_gettext "Unable to find current revision in submodule path '\$modulepath'")"
 		fi
 
 		if test "$subsha1" != "$sha1"
@@ -550,7 +550,7 @@ Maybe you want to use 'update --init'?")"
 				(clear_local_git_env; cd "$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 "$(modulepath=$path eval_gettext "Unable to fetch in submodule path '\$modulepath'")"
 			fi
 
 			# Is this something we just cloned?
@@ -564,20 +564,20 @@ Maybe you want to use 'update --init'?")"
 			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="$(modulepath=$path eval_gettext "Unable to rebase '\$sha1' in submodule path '\$modulepath'")"
+				say_msg="$(modulepath=$path eval_gettext "Submodule path '\$modulepath': 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="$(modulepath=$path eval_gettext "Unable to merge '\$sha1' in submodule path '\$modulepath'")"
+				say_msg="$(modulepath=$path eval_gettext "Submodule path '\$modulepath': 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="$(modulepath=$path eval_gettext "Unable to checkout '\$sha1' in submodule path '\$modulepath'")"
+				say_msg="$(modulepath=$path eval_gettext "Submodule path '\$modulepath': checked out '\$sha1'")"
 				;;
 			esac
 
@@ -599,7 +599,7 @@ Maybe you want to use 'update --init'?")"
 			res=$?
 			if test $res -gt 0
 			then
-				die_msg="$(eval_gettext "Failed to recurse into submodule path '\$path'")"
+				die_msg="$(modulepath=$path eval_gettext "Failed to recurse into submodule path '\$modulepath'")"
 				if test $res -eq 1
 				then
 					err="${err};$die_msg"
@@ -926,7 +926,7 @@ cmd_status()
 				cd "$path" &&
 				eval cmd_status "$orig_args"
 			) ||
-			die "$(eval_gettext "Failed to recurse into submodule path '\$path'")"
+			die "$(modulepath=$path eval_gettext "Failed to recurse into submodule path '\$modulepath'")"
 		fi
 	done
 }
-- 
2.11.4.GIT