scripts: more "export VAR=VALUE" fixes
Found by git grep '[^-]export [^&]*=' -- \*.sh Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
May 23, 2014 at 11:19 UTC
c1cebcf4314a8f18ec06e6d10ce39f49a59076ec
2 files changed
+10
-2
t/t3032-merge-recursive-options.sh
+5
-1
@@ -14,7 +14,11 @@ test_description='merge-recursive options
14
. ./test-lib.sh
15
16
test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b
17
-test_have_prereq GREP_STRIPS_CR && export GREP_OPTIONS=-U
17
+if test_have_prereq GREP_STRIPS_CR
18
+then
19
+ GREP_OPTIONS=-U
20
+ export GREP_OPTIONS
21
+fi
22
23
test_expect_success 'setup' '
24
conflict_hunks () {
t/t5560-http-backend-noserver.sh
+5
-1
@@ -5,7 +5,11 @@ test_description='test git-http-backend-noserver'
5
6
HTTPD_DOCUMENT_ROOT_PATH="$TRASH_DIRECTORY"
7
8
-test_have_prereq GREP_STRIPS_CR && export GREP_OPTIONS=-U
8
+if test_have_prereq GREP_STRIPS_CR
9
+then
10
+ GREP_OPTIONS=-U
11
+ export GREP_OPTIONS
12
+fi
13
14
run_backend() {
15
echo "$2" |