summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-06-10 22:26:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-10 22:26:04 (GMT)
commit8ffc9d26e41f1ce23acbaee0f14419d99677b5f9 (patch)
treea2cfed2808df66c09005ee21734f0693588cc9e0
parent49fa3dc76179e04b0833542fa52d0f287a4955ac (diff)
parentfe17fc0006927246c5905ef9352e7e89a3c5814b (diff)
downloadgit-8ffc9d26e41f1ce23acbaee0f14419d99677b5f9.zip
git-8ffc9d26e41f1ce23acbaee0f14419d99677b5f9.tar.gz
git-8ffc9d26e41f1ce23acbaee0f14419d99677b5f9.tar.bz2
Merge branch 'jc/t2300-setup'
A test fix. * jc/t2300-setup: t2300: run git-sh-setup in an environment that better mimics the real life
-rwxr-xr-xt/t2300-cd-to-toplevel.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t2300-cd-to-toplevel.sh b/t/t2300-cd-to-toplevel.sh
index 9965bc5..cccd7d9 100755
--- 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" ]
)