t2300: run git-sh-setup in an environment that better mimics the real life

gitster · gitster · commit fe17fc000692 · 2016-06-01T14:15:17.000-07:00
When we run scripted Porcelains, "git" potty has set up the $PATH by
prepending $GIT_EXEC_PATH, the path given by "git --exec-path=$there
$cmd", etc. already.  Because of this, scripted Porcelains can
dot-source shell script library like git-sh-setup with simple dot
without specifying any path.

t2300 however dot-sources git-sh-setup without adjusting $PATH like
the real "git" potty does.  This has not been a problem so far, but
once git-sh-setup wants to rely on the $PATH adjustment, just like
any scripted Porcelains already do, it would become one.  It cannot
for example dot-source another shell library without specifying the
full path to it by prefixing $(git --exec-path).

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t2300-cd-to-toplevel.sh b/t/t2300-cd-to-toplevel.sh
@@ -8,7 +8,8 @@ test_cd_to_toplevel () {
 	test_expect_success $3 "$2" '
 		(
 			cd '"'$1'"' &&
-			. "$(git --exec-path)"/git-sh-setup &&
+			PATH="$(git --exec-path):$PATH" &&
+			. git-sh-setup &&
 			cd_to_toplevel &&
 			[ "$(pwd -P)" = "$TOPLEVEL" ]
 		)

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@ test_cd_to_toplevel () {`
`8`	`8`	`test_expect_success $3 "$2" '`
`9`	`9`	`(`
`10`	`10`	`cd '"'$1'"' &&`
`11`		`- . "$(git --exec-path)"/git-sh-setup &&`
	`11`	`+ PATH="$(git --exec-path):$PATH" &&`
	`12`	`+ . git-sh-setup &&`
`12`	`13`	`cd_to_toplevel &&`
`13`	`14`	`[ "$(pwd -P)" = "$TOPLEVEL" ]`
`14`	`15`	`)`