From: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
Date: Sat, 28 Nov 2009 18:38:54 +0000 (-0700)
Subject: t2300: use documented technique to invoke git-sh-setup
X-Git-Tag: v1.6.6-rc1~22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=42ac496edc3dcd1f0b272da62401f62c47f93312;p=git.git

t2300: use documented technique to invoke git-sh-setup

This is needed to allow the test suite to run against a standard
install bin directory instead of GIT_EXEC_PATH.

Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t2300-cd-to-toplevel.sh b/t/t2300-cd-to-toplevel.sh
index 3b01ad2e4..9965bc5c9 100755
--- a/t/t2300-cd-to-toplevel.sh
+++ b/t/t2300-cd-to-toplevel.sh
@@ -8,7 +8,7 @@ test_cd_to_toplevel () {
 	test_expect_success $3 "$2" '
 		(
 			cd '"'$1'"' &&
-			. git-sh-setup &&
+			. "$(git --exec-path)"/git-sh-setup &&
 			cd_to_toplevel &&
 			[ "$(pwd -P)" = "$TOPLEVEL" ]
 		)