scripts: more "export VAR=VALUE" fixes

Found by

    git grep '[^-]export [^&]*=' -- \*.sh

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2014-05-23 11:19:34 -07:00
parent bed137d2d5
commit c1cebcf431
2 changed files with 10 additions and 2 deletions

View File

@ -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 () {

View File

@ -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" |