Fix post-receive-email test for USER_EMAIL variable.

[git-central.git] / tests / t2204-server-post-receive-email-conflicts.sh

diff --git a/tests/t2204-server-post-receive-email-conflicts.sh b/tests/t2204-server-post-receive-email-conflicts.sh
index 45b7cb9..f86e6ba 100644 (file)
--- a/tests/t2204-server-post-receive-email-conflicts.sh
+++ b/tests/t2204-server-post-receive-email-conflicts.sh
@@ -4,7 +4,7 @@ test_description='server post-receive email notification and how it behaves in o
 
 . ./test-lib.sh
 
-export USER=author
+export USER_EMAIL=author@example.com
 
 test_expect_success 'setup' '
        echo "setup" >a &&
@@ -15,11 +15,10 @@ test_expect_success 'setup' '
        git clone ./. server &&
        rm -fr server/.git/hooks &&
        git remote add origin ./server &&
-       git config --add branch.master.remote origin &&
-       git config --add branch.master.merge refs/heads/master &&
-       GIT_DIR=./server/.git git config --add hooks.post-receive-email.mailinglist commits@list.com &&
-       GIT_DIR=./server/.git git config --add hooks.post-receive-email.debug true &&
-       GIT_DIR=. &&
+       git config branch.master.remote origin &&
+       git config branch.master.merge refs/heads/master &&
+       GIT_DIR=./server/.git git config hooks.post-receive-email.mailinglist commits@list.com &&
+       GIT_DIR=./server/.git git config hooks.post-receive-email.debug true &&
        echo cbas >./server/.git/description &&
 
        git checkout -b stable &&