X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=tests%2Ft2204-server-post-receive-email-conflicts.sh;h=f86e6ba6f5235c7639748ced6d5f3220e648889c;hb=f7bba4bfe619be92b4872e2a6c9cff84af43b92d;hp=45b7cb946f9aa91409edd56230e737dfdf433bc5;hpb=b080b59ffab5144ef17812044a459e03e7d1d8ad;p=git-central.git

diff --git a/tests/t2204-server-post-receive-email-conflicts.sh b/tests/t2204-server-post-receive-email-conflicts.sh
index 45b7cb9..f86e6ba 100644
--- 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 &&