Fix post-receive-email test for USER_EMAIL variable.

diff --git a/tests/t2200-1.txt b/tests/t2200-1.txt
index cd80be73998327d13c5fd6fba3380304af227bc0..79f3e013d4fe850b035706cf3c59c91328b57367 100644 (file)
--- a/tests/t2200-1.txt
+++ b/tests/t2200-1.txt
@@ -1,4 +1,4 @@
-From: author@payflex.com
+From: author@example.com
 To: commits@list.com
 Subject: [cbas] master branch updated. $new_commit_hash
 X-Git-Refname: refs/heads/master

diff --git a/tests/t2200-server-post-receive-email.sh b/tests/t2200-server-post-receive-email.sh
index 3b42aff203ca6b65e60d1c8651caeb7821c91571..28733dbcbabda9392ac6977dd3510d7854aa4816 100644 (file)
--- a/tests/t2200-server-post-receive-email.sh
+++ b/tests/t2200-server-post-receive-email.sh
@@ -4,7 +4,7 @@ test_description='server post-receive email notification'
 
 . ./test-lib.sh
 
-export USER=author
+export USER_EMAIL=author@example.com
 
 test_expect_success 'setup' '
        echo "setup" >a &&
@@ -13,11 +13,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
 '
 

diff --git a/tests/t2201-1.txt b/tests/t2201-1.txt
index d19fb71ed453102641016eb46ded5155be420e95..46b6099eab59fc0e78477c29ae69ea3969a95382 100644 (file)
--- a/tests/t2201-1.txt
+++ b/tests/t2201-1.txt
@@ -1,4 +1,4 @@
-From: author@payflex.com
+From: author@example.com
 To: commits@list.com
 Subject: [cbas] 1.0 annotated tag created. 1.0
 X-Git-Refname: refs/tags/1.0

diff --git a/tests/t2201-2.txt b/tests/t2201-2.txt
index c00a443cbdc9641433acced02cb5af0971cea1a3..18b0c0571ec07abf9d54da69efdc6cb7a4f53eb8 100644 (file)
--- a/tests/t2201-2.txt
+++ b/tests/t2201-2.txt
@@ -1,4 +1,4 @@
-From: author@payflex.com
+From: author@example.com
 To: commits@list.com
 Subject: [cbas] master branch updated. 1.0-2-g$new_commit_abbrev
 X-Git-Refname: refs/heads/master

diff --git a/tests/t2201-3.txt b/tests/t2201-3.txt
index 3646a0961149798284f32fc6d863dcc51d7cbd6a..1f128f499202344da8af082fcd143ac37874710a 100644 (file)
--- a/tests/t2201-3.txt
+++ b/tests/t2201-3.txt
@@ -1,4 +1,4 @@
-From: author@payflex.com
+From: author@example.com
 To: commits@list.com
 Subject: [cbas] 2.0 annotated tag created. 2.0
 X-Git-Refname: refs/tags/2.0

diff --git a/tests/t2201-4.txt b/tests/t2201-4.txt
index 0cc9d47bef5801dd502aa104a340735014451665..47bd8c32184f919210b1932006428e31b608ba1c 100644 (file)
--- a/tests/t2201-4.txt
+++ b/tests/t2201-4.txt
@@ -1,4 +1,4 @@
-From: author@payflex.com
+From: author@example.com
 To: commits@list.com
 Subject: [cbas] 2.1 tag created. $new_commit_describe
 X-Git-Refname: refs/tags/2.1

diff --git a/tests/t2201-5.txt b/tests/t2201-5.txt
index 70379a76c0a259caae53d9a5fd4496bc97733833..8fbafe66a47055bff2324cd5e965cd5ae7c9b1bb 100644 (file)
--- a/tests/t2201-5.txt
+++ b/tests/t2201-5.txt
@@ -1,4 +1,4 @@
-From: author@payflex.com
+From: author@example.com
 To: commits@list.com
 Subject: [cbas] 2.1 tag updated. $new_commit_describe
 X-Git-Refname: refs/tags/2.1

diff --git a/tests/t2201-6.txt b/tests/t2201-6.txt
index a0f2f93630b0c605d1a53365a3cdb9cbce7f2471..abcd52d1d39bdfbfad0619f659d19c38b4127980 100644 (file)
--- a/tests/t2201-6.txt
+++ b/tests/t2201-6.txt
@@ -1,4 +1,4 @@
-From: author@payflex.com
+From: author@example.com
 To: commits@list.com
 Subject: [cbas] 2.1 tag deleted. $old_commit_describe
 X-Git-Refname: refs/tags/2.1

diff --git a/tests/t2201-7.txt b/tests/t2201-7.txt
index afcf16539051d3a11e843f7f2108d013f6f351ee..9bb498ec213f9ae5cde206ed4ec8b3d4e97c866e 100644 (file)
--- a/tests/t2201-7.txt
+++ b/tests/t2201-7.txt
@@ -1,4 +1,4 @@
-From: author@payflex.com
+From: author@example.com
 To: commits@list.com
 Subject: [cbas] 2.0 annotated tag updated. 2.0
 X-Git-Refname: refs/tags/2.0

diff --git a/tests/t2201-8.txt b/tests/t2201-8.txt
index 669dedd8959e66cedd99ca2ae8ffb8525bfff673..500b78ca784380c0070a57f926a73df7c76e540d 100644 (file)
--- a/tests/t2201-8.txt
+++ b/tests/t2201-8.txt
@@ -1,4 +1,4 @@
-From: author@payflex.com
+From: author@example.com
 To: commits@list.com
 Subject: [cbas] 2.0 annotated tag deleted. $new_commit_describe
 X-Git-Refname: refs/tags/2.0

diff --git a/tests/t2201-server-post-receive-email-tags.sh b/tests/t2201-server-post-receive-email-tags.sh
index 480f9cf30e5bca75cc600908885b6721ffae49d5..4b9f5a51c64ef2062b5f547df4b9999fd120b6f8 100644 (file)
--- a/tests/t2201-server-post-receive-email-tags.sh
+++ b/tests/t2201-server-post-receive-email-tags.sh
@@ -4,7 +4,7 @@ test_description='server post-receive email notification'
 
 . ./test-lib.sh
 
-export USER=author
+export USER_EMAIL=author@example.com
 
 test_expect_success 'setup' '
        echo "setup" >a &&
@@ -13,11 +13,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
 '
 

diff --git a/tests/t2202-1.txt b/tests/t2202-1.txt
index 3e5566c3a149d90227d1d78af29a43ad5ed549df..ab0486397f8029377a75766a8a56781f38a47d26 100644 (file)
--- a/tests/t2202-1.txt
+++ b/tests/t2202-1.txt
@@ -1,4 +1,4 @@
-From: author@payflex.com
+From: author@example.com
 To: commits@list.com
 Subject: [cbas] topic branch created. $new_commit_hash
 X-Git-Refname: refs/heads/topic

diff --git a/tests/t2202-2.txt b/tests/t2202-2.txt
index 573f010ec8f4f82dabd8498dcc9995f26e06599a..519d3703aee0dc888f002eb6b3fade4cffcfe2db 100644 (file)
--- a/tests/t2202-2.txt
+++ b/tests/t2202-2.txt
@@ -1,4 +1,4 @@
-From: author@payflex.com
+From: author@example.com
 To: commits@list.com
 Subject: [cbas] topic branch deleted. $old_commit_hash
 X-Git-Refname: refs/heads/topic

diff --git a/tests/t2202-3.txt b/tests/t2202-3.txt
index a6d04c83c175e0f3e9853186e6e5f0c0acfab2cf..128a1c8b0b9c277b48342132b9c4bad2c5c7cec9 100644 (file)
--- a/tests/t2202-3.txt
+++ b/tests/t2202-3.txt
@@ -1,4 +1,4 @@
-From: author@payflex.com
+From: author@example.com
 To: commits@list.com
 Subject: [cbas] topic2 branch created. $existing_commit_hash
 X-Git-Refname: refs/heads/topic2

diff --git a/tests/t2202-4.txt b/tests/t2202-4.txt
index ffab4be3e9145a59b531f637ef3b0df1bcbc89f9..f96730723d370f27ad3e87bf4db2c698cec6f8cc 100644 (file)
--- a/tests/t2202-4.txt
+++ b/tests/t2202-4.txt
@@ -1,4 +1,4 @@
-From: author@payflex.com
+From: author@example.com
 To: commits@list.com
 Subject: [cbas] topic branch updated. $existing_commit_hash
 X-Git-Refname: refs/heads/topic

diff --git a/tests/t2202-5.txt b/tests/t2202-5.txt
index ca002002336bac5b6db466fd16e5f3501fba3275..8261dec0fb35fa82f265ba47ce3fa45bafe0405b 100644 (file)
--- a/tests/t2202-5.txt
+++ b/tests/t2202-5.txt
@@ -1,4 +1,4 @@
-From: author@payflex.com
+From: author@example.com
 To: commits@list.com
 Subject: [cbas] topic branch updated. $new_commit_hash
 X-Git-Refname: refs/heads/topic

diff --git a/tests/t2202-6.txt b/tests/t2202-6.txt
index 218bcde77223e2fb4ecea80d4a8d917abbe3e4ec..c7178b59d9d73819c327cf519d6e9a1ffbcaa75e 100644 (file)
--- a/tests/t2202-6.txt
+++ b/tests/t2202-6.txt
@@ -1,4 +1,4 @@
-From: author@payflex.com
+From: author@example.com
 To: commits@list.com
 Subject: [cbas] topic branch updated. $new_commit_hash
 X-Git-Refname: refs/heads/topic

diff --git a/tests/t2202-server-post-receive-email-branches.sh b/tests/t2202-server-post-receive-email-branches.sh
index 830a860deeb5dcd0ad9d6fa1c6b40dd1a5ae1a92..d794b11a9499462324c51ace35e7d7c10135a373 100644 (file)
--- a/tests/t2202-server-post-receive-email-branches.sh
+++ b/tests/t2202-server-post-receive-email-branches.sh
@@ -4,7 +4,7 @@ test_description='server post-receive email notification'
 
 . ./test-lib.sh
 
-export USER=author
+export USER_EMAIL=author@example.com
 
 test_expect_success 'setup' '
        echo "setup" >a &&
@@ -13,11 +13,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
 '
 

diff --git a/tests/t2203-1.txt b/tests/t2203-1.txt
index 2279ac14670f7823bfa1d24b5b5ff96a7644772d..bf8d28f09ed44401d9be1aa39b708bd2ac287d5f 100644 (file)
--- a/tests/t2203-1.txt
+++ b/tests/t2203-1.txt
@@ -1,4 +1,4 @@
-From: author@payflex.com
+From: author@example.com
 To: commits@list.com
 Subject: [cbas] topic1 branch updated. $new_commit_hash
 X-Git-Refname: refs/heads/topic1

diff --git a/tests/t2203-2.txt b/tests/t2203-2.txt
index 81f3c52b9f9558545e18a76cc865b9885677a800..3da2cdb9809b6a5384035a1f7fa29b6c53d81921 100644 (file)
--- a/tests/t2203-2.txt
+++ b/tests/t2203-2.txt
@@ -1,4 +1,4 @@
-From: author@payflex.com
+From: author@example.com
 To: commits@list.com
 Subject: [cbas] topic1 branch updated. $new_commit_hash
 X-Git-Refname: refs/heads/topic1

diff --git a/tests/t2203-server-post-receive-email-stable.sh b/tests/t2203-server-post-receive-email-stable.sh
index f8fe3ed8dd50f8459cf6d3797bc6e99c9ddda716..bf545f97209551aefdfcde892db92192a4766419 100644 (file)
--- a/tests/t2203-server-post-receive-email-stable.sh
+++ b/tests/t2203-server-post-receive-email-stable.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 &&

diff --git a/tests/t2204-1.txt b/tests/t2204-1.txt
index 4b7d92b8b4c774fe4ca73c6667ebae16ed04e01b..8e5bef15282f636b52a1a0cde91beb8223357b6a 100644 (file)
--- a/tests/t2204-1.txt
+++ b/tests/t2204-1.txt
@@ -1,45 +1,45 @@
-From: author@payflex.com\r
-To: commits@list.com\r
-Subject: [cbas] topic1 branch updated. $new_commit_hash\r
-X-Git-Refname: refs/heads/topic1\r
-X-Git-Reftype: branch\r
-X-Git-Oldrev: $old_commit_hash\r
-X-Git-Newrev: $new_commit_hash\r
-\r
-The branch, topic1 has been updated\r
-       via $new_commit_abbrev resolved lines for merging stable into topic1\r
-      from $old_commit_abbrev lines changed on topic1\r
-\r
-Those revisions listed above that are new to this repository have\r
-not appeared on any other notification email; so we list those\r
-revisions in full, below.\r
-\r
-- Log -----------------------------------------------------------------\r
-\r
-commit $new_commit_hash\r
-Merge: $old_commit_hash $stable_hash\r
-Author: A U Thor <author@example.com>\r
-Date:   $new_commit_date\r
-\r
-    resolved lines for merging stable into topic1\r
-\r
-$new_commit_hash\r
-diff --cc a\r
-index d288e69,a9ccdfe..3f45f93\r
---- a/a\r
-+++ b/a\r
-@@@ -1,3 -1,3 +1,3 @@@\r
-- line1.topic1\r
-- line2.topic1\r
-- line3.topic1\r
- -line1.stable\r
-++line1.topic\r
-+ line2.stable\r
- -line3.stable\r
-++line3.resolved\r
-\r
------------------------------------------------------------------------\r
-\r
-Summary of changes:\r
- a |    6 +++---\r
- 1 files changed, 3 insertions(+), 3 deletions(-)\r
+From: author@example.com
+To: commits@list.com
+Subject: [cbas] topic1 branch updated. $new_commit_hash
+X-Git-Refname: refs/heads/topic1
+X-Git-Reftype: branch
+X-Git-Oldrev: $old_commit_hash
+X-Git-Newrev: $new_commit_hash
+
+The branch, topic1 has been updated
+       via $new_commit_abbrev resolved lines for merging stable into topic1
+      from $old_commit_abbrev lines changed on topic1
+
+Those revisions listed above that are new to this repository have
+not appeared on any other notification email; so we list those
+revisions in full, below.
+
+- Log -----------------------------------------------------------------
+
+commit $new_commit_hash
+Merge: $old_commit_hash $stable_hash
+Author: A U Thor <author@example.com>
+Date:   $new_commit_date
+
+    resolved lines for merging stable into topic1
+
+$new_commit_hash
+diff --cc a
+index d288e69,a9ccdfe..3f45f93
+--- a/a
++++ b/a
+@@@ -1,3 -1,3 +1,3 @@@
+- line1.topic1
+- line2.topic1
+- line3.topic1
+ -line1.stable
+++line1.topic
++ line2.stable
+ -line3.stable
+++line3.resolved
+
+-----------------------------------------------------------------------
+
+Summary of changes:
+ a |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)

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