Don't use the 'export NAME=value' in the test scripts.
This form is not portable across all shells, so replace instances of: export FOO=bar with: FOO=bar export FOO Signed-off-by: Bryan Donlan <bdonlan@fushizen.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
cdf3ec01ac
commit
0e46e70462
@ -61,7 +61,8 @@ prepare_httpd() {
|
||||
-new -x509 -nodes \
|
||||
-out $HTTPD_ROOT_PATH/httpd.pem \
|
||||
-keyout $HTTPD_ROOT_PATH/httpd.pem
|
||||
export GIT_SSL_NO_VERIFY=t
|
||||
GIT_SSL_NO_VERIFY=t
|
||||
export GIT_SSL_NO_VERIFY
|
||||
HTTPD_PARA="$HTTPD_PARA -DSSL"
|
||||
else
|
||||
HTTPD_URL=http://127.0.0.1:$LIB_HTTPD_PORT
|
||||
|
@ -51,8 +51,9 @@ test_rev_parse 'core.bare undefined' false false true
|
||||
|
||||
mkdir work || exit 1
|
||||
cd work || exit 1
|
||||
export GIT_DIR=../.git
|
||||
export GIT_CONFIG="$(pwd)"/../.git/config
|
||||
GIT_DIR=../.git
|
||||
GIT_CONFIG="$(pwd)"/../.git/config
|
||||
export GIT_DIR GIT_CONFIG
|
||||
|
||||
git config core.bare false
|
||||
test_rev_parse 'GIT_DIR=../.git, core.bare = false' false false true ''
|
||||
@ -64,8 +65,8 @@ git config --unset core.bare
|
||||
test_rev_parse 'GIT_DIR=../.git, core.bare undefined' false false true ''
|
||||
|
||||
mv ../.git ../repo.git || exit 1
|
||||
export GIT_DIR=../repo.git
|
||||
export GIT_CONFIG="$(pwd)"/../repo.git/config
|
||||
GIT_DIR=../repo.git
|
||||
GIT_CONFIG="$(pwd)"/../repo.git/config
|
||||
|
||||
git config core.bare false
|
||||
test_rev_parse 'GIT_DIR=../repo.git, core.bare = false' false false true ''
|
||||
|
@ -32,24 +32,25 @@ mkdir -p work/sub/dir || exit 1
|
||||
mv .git repo.git || exit 1
|
||||
|
||||
say "core.worktree = relative path"
|
||||
export GIT_DIR=repo.git
|
||||
export GIT_CONFIG="$(pwd)"/$GIT_DIR/config
|
||||
GIT_DIR=repo.git
|
||||
GIT_CONFIG="$(pwd)"/$GIT_DIR/config
|
||||
export GIT_DIR GIT_CONFIG
|
||||
unset GIT_WORK_TREE
|
||||
git config core.worktree ../work
|
||||
test_rev_parse 'outside' false false false
|
||||
cd work || exit 1
|
||||
export GIT_DIR=../repo.git
|
||||
export GIT_CONFIG="$(pwd)"/$GIT_DIR/config
|
||||
GIT_DIR=../repo.git
|
||||
GIT_CONFIG="$(pwd)"/$GIT_DIR/config
|
||||
test_rev_parse 'inside' false false true ''
|
||||
cd sub/dir || exit 1
|
||||
export GIT_DIR=../../../repo.git
|
||||
export GIT_CONFIG="$(pwd)"/$GIT_DIR/config
|
||||
GIT_DIR=../../../repo.git
|
||||
GIT_CONFIG="$(pwd)"/$GIT_DIR/config
|
||||
test_rev_parse 'subdirectory' false false true sub/dir/
|
||||
cd ../../.. || exit 1
|
||||
|
||||
say "core.worktree = absolute path"
|
||||
export GIT_DIR=$(pwd)/repo.git
|
||||
export GIT_CONFIG=$GIT_DIR/config
|
||||
GIT_DIR=$(pwd)/repo.git
|
||||
GIT_CONFIG=$GIT_DIR/config
|
||||
git config core.worktree "$(pwd)/work"
|
||||
test_rev_parse 'outside' false false false
|
||||
cd work || exit 1
|
||||
@ -59,25 +60,26 @@ test_rev_parse 'subdirectory' false false true sub/dir/
|
||||
cd ../../.. || exit 1
|
||||
|
||||
say "GIT_WORK_TREE=relative path (override core.worktree)"
|
||||
export GIT_DIR=$(pwd)/repo.git
|
||||
export GIT_CONFIG=$GIT_DIR/config
|
||||
GIT_DIR=$(pwd)/repo.git
|
||||
GIT_CONFIG=$GIT_DIR/config
|
||||
git config core.worktree non-existent
|
||||
export GIT_WORK_TREE=work
|
||||
GIT_WORK_TREE=work
|
||||
export GIT_WORK_TREE
|
||||
test_rev_parse 'outside' false false false
|
||||
cd work || exit 1
|
||||
export GIT_WORK_TREE=.
|
||||
GIT_WORK_TREE=.
|
||||
test_rev_parse 'inside' false false true ''
|
||||
cd sub/dir || exit 1
|
||||
export GIT_WORK_TREE=../..
|
||||
GIT_WORK_TREE=../..
|
||||
test_rev_parse 'subdirectory' false false true sub/dir/
|
||||
cd ../../.. || exit 1
|
||||
|
||||
mv work repo.git/work
|
||||
|
||||
say "GIT_WORK_TREE=absolute path, work tree below git dir"
|
||||
export GIT_DIR=$(pwd)/repo.git
|
||||
export GIT_CONFIG=$GIT_DIR/config
|
||||
export GIT_WORK_TREE=$(pwd)/repo.git/work
|
||||
GIT_DIR=$(pwd)/repo.git
|
||||
GIT_CONFIG=$GIT_DIR/config
|
||||
GIT_WORK_TREE=$(pwd)/repo.git/work
|
||||
test_rev_parse 'outside' false false false
|
||||
cd repo.git || exit 1
|
||||
test_rev_parse 'in repo.git' false true false
|
||||
|
@ -9,7 +9,8 @@ This test runs git rebase and checks that the author information is not lost.
|
||||
'
|
||||
. ./test-lib.sh
|
||||
|
||||
export GIT_AUTHOR_EMAIL=bogus_email_address
|
||||
GIT_AUTHOR_EMAIL=bogus_email_address
|
||||
export GIT_AUTHOR_EMAIL
|
||||
|
||||
test_expect_success \
|
||||
'prepare repository with topic branches' \
|
||||
|
@ -10,7 +10,8 @@ checks that git cherry only returns the second patch in the local branch
|
||||
'
|
||||
. ./test-lib.sh
|
||||
|
||||
export GIT_AUTHOR_EMAIL=bogus_email_address
|
||||
GIT_AUTHOR_EMAIL=bogus_email_address
|
||||
export GIT_AUTHOR_EMAIL
|
||||
|
||||
test_expect_success \
|
||||
'prepare repository with topic branch, and check cherry finds the 2 patches from there' \
|
||||
|
@ -31,7 +31,7 @@ add () {
|
||||
sec=$(($sec+1))
|
||||
commit=$(echo "$text" | GIT_AUTHOR_DATE=$sec \
|
||||
git commit-tree $tree $parents 2>>log2.txt)
|
||||
export $name=$commit
|
||||
eval "$name=$commit; export $name"
|
||||
echo $commit > .git/refs/heads/$branch
|
||||
eval ${branch}TIP=$commit
|
||||
}
|
||||
|
@ -49,13 +49,15 @@ as_author()
|
||||
shift 1
|
||||
_save=$GIT_AUTHOR_EMAIL
|
||||
|
||||
export GIT_AUTHOR_EMAIL="$_author"
|
||||
GIT_AUTHOR_EMAIL="$_author"
|
||||
export GIT_AUTHOR_EMAIL
|
||||
"$@"
|
||||
if test -z "$_save"
|
||||
then
|
||||
unset GIT_AUTHOR_EMAIL
|
||||
else
|
||||
export GIT_AUTHOR_EMAIL="$_save"
|
||||
GIT_AUTHOR_EMAIL="$_save"
|
||||
export GIT_AUTHOR_EMAIL
|
||||
fi
|
||||
}
|
||||
|
||||
@ -69,7 +71,8 @@ on_committer_date()
|
||||
{
|
||||
_date=$1
|
||||
shift 1
|
||||
export GIT_COMMITTER_DATE="$_date"
|
||||
GIT_COMMITTER_DATE="$_date"
|
||||
export GIT_COMMITTER_DATE
|
||||
"$@"
|
||||
unset GIT_COMMITTER_DATE
|
||||
}
|
||||
|
@ -13,10 +13,11 @@ T=$(git write-tree)
|
||||
M=1130000000
|
||||
Z=+0000
|
||||
|
||||
export GIT_COMMITTER_EMAIL=git@comm.iter.xz
|
||||
export GIT_COMMITTER_NAME='C O Mmiter'
|
||||
export GIT_AUTHOR_NAME='A U Thor'
|
||||
export GIT_AUTHOR_EMAIL=git@au.thor.xz
|
||||
GIT_COMMITTER_EMAIL=git@comm.iter.xz
|
||||
GIT_COMMITTER_NAME='C O Mmiter'
|
||||
GIT_AUTHOR_NAME='A U Thor'
|
||||
GIT_AUTHOR_EMAIL=git@au.thor.xz
|
||||
export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
|
||||
|
||||
doit() {
|
||||
OFFSET=$1; shift
|
||||
|
@ -626,7 +626,8 @@ esac
|
||||
|
||||
cp -R ../t7004 ./gpghome
|
||||
chmod 0700 gpghome
|
||||
export GNUPGHOME="$(pwd)/gpghome"
|
||||
GNUPGHOME="$(pwd)/gpghome"
|
||||
export GNUPGHOME
|
||||
|
||||
get_tag_header signed-tag $commit commit $time >expect
|
||||
echo 'A signed tag message' >>expect
|
||||
|
@ -39,13 +39,15 @@ EOF
|
||||
}
|
||||
|
||||
gitweb_run () {
|
||||
export GATEWAY_INTERFACE="CGI/1.1"
|
||||
export HTTP_ACCEPT="*/*"
|
||||
export REQUEST_METHOD="GET"
|
||||
export QUERY_STRING=""$1""
|
||||
export PATH_INFO=""$2""
|
||||
GATEWAY_INTERFACE="CGI/1.1"
|
||||
HTTP_ACCEPT="*/*"
|
||||
REQUEST_METHOD="GET"
|
||||
QUERY_STRING=""$1""
|
||||
PATH_INFO=""$2""
|
||||
export GATEWAY_INTERFACE HTTP_ACCEPT REQUEST_METHOD QUERY_STRING PATH_INFO
|
||||
|
||||
export GITWEB_CONFIG=$(pwd)/gitweb_config.perl
|
||||
GITWEB_CONFIG=$(pwd)/gitweb_config.perl
|
||||
export GITWEB_CONFIG
|
||||
|
||||
# some of git commands write to STDERR on error, but this is not
|
||||
# written to web server logs, so we are not interested in that:
|
||||
|
Loading…
Reference in New Issue
Block a user