Skip to content

Commit 20f7f83

Browse files
committed
Merge branch 'jc/t2300-setup' into next
A test fix. * jc/t2300-setup: t2300: run git-sh-setup in an environment that better mimics the real life
2 parents 505f1ee + fe17fc0 commit 20f7f83

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

t/t2300-cd-to-toplevel.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ test_cd_to_toplevel () {
88
test_expect_success $3 "$2" '
99
(
1010
cd '"'$1'"' &&
11-
. "$(git --exec-path)"/git-sh-setup &&
11+
PATH="$(git --exec-path):$PATH" &&
12+
. git-sh-setup &&
1213
cd_to_toplevel &&
1314
[ "$(pwd -P)" = "$TOPLEVEL" ]
1415
)

0 commit comments

Comments
 (0)