diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-06-10 15:26:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-10 15:26:04 -0700 |
| commit | 8ffc9d26e41f1ce23acbaee0f14419d99677b5f9 (patch) | |
| tree | a2cfed2808df66c09005ee21734f0693588cc9e0 | |
| parent | 49fa3dc76179e04b0833542fa52d0f287a4955ac (diff) | |
| parent | fe17fc0006927246c5905ef9352e7e89a3c5814b (diff) | |
| download | git-8ffc9d26e41f1ce23acbaee0f14419d99677b5f9.tar.gz | |
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-x | t/t2300-cd-to-toplevel.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t2300-cd-to-toplevel.sh b/t/t2300-cd-to-toplevel.sh index 9965bc5c92..cccd7d923a 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" ] ) |