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 | |
| 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
| -rwxr-xr-x | contrib/subtree/t/t7900-subtree.sh | 3 | ||||
| -rwxr-xr-x | git-remote-testgit.sh | 3 | ||||
| -rwxr-xr-x | git-stash.sh | 3 | ||||
| -rwxr-xr-x | t/t3032-merge-recursive-options.sh | 6 | ||||
| -rwxr-xr-x | t/t5560-http-backend-noserver.sh | 6 |
5 files changed, 16 insertions, 5 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 diff --git a/git-remote-testgit.sh b/git-remote-testgit.sh index 1c006a0518..a9c75a2360 100755 --- a/git-remote-testgit.sh +++ b/git-remote-testgit.sh @@ -13,7 +13,8 @@ refspec="${GIT_REMOTE_TESTGIT_REFSPEC-$default_refspec}" test -z "$refspec" && prefix="refs" -export GIT_DIR="$url/.git" +GIT_DIR="$url/.git" +export GIT_DIR force= diff --git a/git-stash.sh b/git-stash.sh index 4798bcf0e5..4621d81fab 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -94,7 +94,8 @@ create_stash () { # ease of unpacking later. u_commit=$( untracked_files | ( - export GIT_INDEX_FILE="$TMPindex" + GIT_INDEX_FILE="$TMPindex" && + export GIT_INDEX_FILE && rm -f "$TMPindex" && git update-index -z --add --remove --stdin && u_tree=$(git write-tree) && diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh index 5fd7bbb652..4029c9c8c0 100755 --- a/t/t3032-merge-recursive-options.sh +++ b/t/t3032-merge-recursive-options.sh @@ -14,7 +14,11 @@ test_description='merge-recursive options . ./test-lib.sh test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b -test_have_prereq GREP_STRIPS_CR && export GREP_OPTIONS=-U +if test_have_prereq GREP_STRIPS_CR +then + GREP_OPTIONS=-U + export GREP_OPTIONS +fi test_expect_success 'setup' ' conflict_hunks () { diff --git a/t/t5560-http-backend-noserver.sh b/t/t5560-http-backend-noserver.sh index 5abd11a563..aa73eeaef8 100755 --- a/t/t5560-http-backend-noserver.sh +++ b/t/t5560-http-backend-noserver.sh @@ -5,7 +5,11 @@ test_description='test git-http-backend-noserver' HTTPD_DOCUMENT_ROOT_PATH="$TRASH_DIRECTORY" -test_have_prereq GREP_STRIPS_CR && export GREP_OPTIONS=-U +if test_have_prereq GREP_STRIPS_CR +then + GREP_OPTIONS=-U + export GREP_OPTIONS +fi run_backend() { echo "$2" | |