diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-22 10:22:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-22 10:22:57 -0700 |
| commit | 63618af24a67e5fc959217201d9f220383a39fd0 (patch) | |
| tree | a6b75c4ebc22e529a11ff462afecfac20ecf713f /contrib | |
| parent | bba6acb335e296ed692b4aea224b50fd098f693c (diff) | |
| parent | c1cebcf4314a8f18ec06e6d10ce39f49a59076ec (diff) | |
| download | git-63618af24a67e5fc959217201d9f220383a39fd0.tar.gz | |
Merge branch 'ep/shell-assign-and-export-vars' into maint
* ep/shell-assign-and-export-vars:
scripts: more "export VAR=VALUE" fixes
scripts: "export VAR=VALUE" construct is not portable
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/subtree/t/t7900-subtree.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh index 66ce4b07c2..8dc6840353 100755 --- a/contrib/subtree/t/t7900-subtree.sh +++ b/contrib/subtree/t/t7900-subtree.sh @@ -8,7 +8,8 @@ This test verifies the basic operation of the merge, pull, add and split subcommands of git subtree. ' -export TEST_DIRECTORY=$(pwd)/../../../t +TEST_DIRECTORY=$(pwd)/../../../t +export TEST_DIRECTORY . ../../../t/test-lib.sh |