summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-05-23 18:19:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-05-23 22:32:54 (GMT)
commitc1cebcf4314a8f18ec06e6d10ce39f49a59076ec (patch)
tree8ed99a6f3cd18030d510aec840506506f76ce399
parentbed137d2d55a3b5cbd642b1e80cd7bd9094db8d4 (diff)
downloadgit-c1cebcf4314a8f18ec06e6d10ce39f49a59076ec.zip
git-c1cebcf4314a8f18ec06e6d10ce39f49a59076ec.tar.gz
git-c1cebcf4314a8f18ec06e6d10ce39f49a59076ec.tar.bz2
scripts: more "export VAR=VALUE" fixes
Found by git grep '[^-]export [^&]*=' -- \*.sh Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t3032-merge-recursive-options.sh6
-rwxr-xr-xt/t5560-http-backend-noserver.sh6
2 files changed, 10 insertions, 2 deletions
diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh
index 5fd7bbb..4029c9c 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 9be9ae3..1e25128 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" |