mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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:
parent
bed137d2d5
commit
c1cebcf431
|
@ -14,7 +14,11 @@ test_description='merge-recursive options
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b
|
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' '
|
test_expect_success 'setup' '
|
||||||
conflict_hunks () {
|
conflict_hunks () {
|
||||||
|
|
|
@ -5,7 +5,11 @@ test_description='test git-http-backend-noserver'
|
||||||
|
|
||||||
HTTPD_DOCUMENT_ROOT_PATH="$TRASH_DIRECTORY"
|
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() {
|
run_backend() {
|
||||||
echo "$2" |
|
echo "$2" |
|
||||||
|
|
Loading…
Reference in a new issue