Tweak the email format.

diff --git a/tests/t2200-1.txt b/tests/t2200-1.txt
index 1917a8e..1bcbb9a 100644 (file)
--- a/tests/t2200-1.txt
+++ b/tests/t2200-1.txt
@@ -1,14 +1,10 @@
 To: commits@list.com
-Subject: [SCM] UNNAMED PROJECT branch, master, updated. $new_commit_hash
+Subject: [cbas] master branch updated. $new_commit_hash
 X-Git-Refname: refs/heads/master
 X-Git-Reftype: branch
 X-Git-Oldrev: $old_commit_hash
 X-Git-Newrev: $new_commit_hash
 
-This is an automated email from the git hooks/post-receive script. It was
-generated because a ref change was pushed to the repository containing
-the project "UNNAMED PROJECT".
-
 The branch, master has been updated
        via  $new_commit_hash (commit)
       from  $old_commit_hash (commit)
@@ -41,4 +37,4 @@ index 146f275..b38f23c 100644
 
 hooks/post-receive
 --
-UNNAMED PROJECT
+cbas

diff --git a/tests/t2200-server-post-receive-email.sh b/tests/t2200-server-post-receive-email.sh
index 1eda0d8..c49ad53 100644 (file)
--- a/tests/t2200-server-post-receive-email.sh
+++ b/tests/t2200-server-post-receive-email.sh
@@ -16,6 +16,7 @@ test_expect_success 'setup' '
        GIT_DIR=./server/.git git config --add hooks.mailinglist commits@list.com &&
        GIT_DIR=./server/.git git config --add hooks.debug true &&
        GIT_DIR=.
+       echo cbas >./server/.git/description
 '
 
 install_server_hook 'post-receive-email' 'post-receive'

diff --git a/tests/t2201-1.txt b/tests/t2201-1.txt
index 3a0dbc6..187053f 100644 (file)
--- a/tests/t2201-1.txt
+++ b/tests/t2201-1.txt
@@ -1,14 +1,10 @@
 To: commits@list.com
-Subject: [SCM] UNNAMED PROJECT annotated tag, 1.0, created. 1.0
+Subject: [cbas] 1.0 annotated tag created. 1.0
 X-Git-Refname: refs/tags/1.0
 X-Git-Reftype: annotated tag
 X-Git-Oldrev: 0000000000000000000000000000000000000000
 X-Git-Newrev: $tag_hash
 
-This is an automated email from the git hooks/post-receive script. It was
-generated because a ref change was pushed to the repository containing
-the project "UNNAMED PROJECT".
-
 The annotated tag, 1.0 has been created
         at  $tag_hash (tag)
    tagging  $new_commit_hash (commit)
@@ -26,4 +22,4 @@ A U Thor (1):
 
 hooks/post-receive
 --
-UNNAMED PROJECT
+cbas

diff --git a/tests/t2201-2.txt b/tests/t2201-2.txt
index 2110bc9..70d2182 100644 (file)
--- a/tests/t2201-2.txt
+++ b/tests/t2201-2.txt
@@ -1,14 +1,10 @@
 To: commits@list.com
-Subject: [SCM] UNNAMED PROJECT branch, master, updated. 1.0-2-g$new_commit_abbrev
+Subject: [cbas] master branch updated. 1.0-2-g$new_commit_abbrev
 X-Git-Refname: refs/heads/master
 X-Git-Reftype: branch
 X-Git-Oldrev: $old_commit_hash
 X-Git-Newrev: $new_commit_hash
 
-This is an automated email from the git hooks/post-receive script. It was
-generated because a ref change was pushed to the repository containing
-the project "UNNAMED PROJECT".
-
 The branch, master has been updated
        via  $new_commit_hash (commit)
        via  $prior_commit_hash (commit)
@@ -48,4 +44,4 @@ index 146f275..affecee 100644
 
 hooks/post-receive
 --
-UNNAMED PROJECT
+cbas

diff --git a/tests/t2201-3.txt b/tests/t2201-3.txt
index 4f3442c..bb10a0c 100644 (file)
--- a/tests/t2201-3.txt
+++ b/tests/t2201-3.txt
@@ -1,14 +1,10 @@
 To: commits@list.com
-Subject: [SCM] UNNAMED PROJECT annotated tag, 2.0, created. 2.0
+Subject: [cbas] 2.0 annotated tag created. 2.0
 X-Git-Refname: refs/tags/2.0
 X-Git-Reftype: annotated tag
 X-Git-Oldrev: 0000000000000000000000000000000000000000
 X-Git-Newrev: $tag_hash
 
-This is an automated email from the git hooks/post-receive script. It was
-generated because a ref change was pushed to the repository containing
-the project "UNNAMED PROJECT".
-
 The annotated tag, 2.0 has been created
         at  $tag_hash (tag)
    tagging  $new_commit_hash (commit)
@@ -28,4 +24,4 @@ A U Thor (2):
 
 hooks/post-receive
 --
-UNNAMED PROJECT
+cbas

diff --git a/tests/t2201-server-post-receive-email-tags.sh b/tests/t2201-server-post-receive-email-tags.sh
index 2a5fb7b..ed823da 100644 (file)
--- a/tests/t2201-server-post-receive-email-tags.sh
+++ b/tests/t2201-server-post-receive-email-tags.sh
@@ -16,6 +16,7 @@ test_expect_success 'setup' '
        GIT_DIR=./server/.git git config --add hooks.mailinglist commits@list.com &&
        GIT_DIR=./server/.git git config --add hooks.debug true &&
        GIT_DIR=.
+       echo cbas >./server/.git/description
 '
 
 install_server_hook 'post-receive-email' 'post-receive'

diff --git a/tests/t2202-1.txt b/tests/t2202-1.txt
index b9c3b3a..bc5bb51 100644 (file)
--- a/tests/t2202-1.txt
+++ b/tests/t2202-1.txt
@@ -1,14 +1,10 @@
 To: commits@list.com
-Subject: [SCM] UNNAMED PROJECT branch, topic, created. $new_commit_hash
+Subject: [cbas] topic branch created. $new_commit_hash
 X-Git-Refname: refs/heads/topic
 X-Git-Reftype: branch
 X-Git-Oldrev: 0000000000000000000000000000000000000000
 X-Git-Newrev: $new_commit_hash
 
-This is an automated email from the git hooks/post-receive script. It was
-generated because a ref change was pushed to the repository containing
-the project "UNNAMED PROJECT".
-
 The branch, topic has been created
         at  $new_commit_hash (commit)
 
@@ -42,4 +38,4 @@ index 146f275..8516a40 100644
 
 hooks/post-receive
 --
-UNNAMED PROJECT
+cbas

diff --git a/tests/t2202-2.txt b/tests/t2202-2.txt
index 3df1b90..2227e4d 100644 (file)
--- a/tests/t2202-2.txt
+++ b/tests/t2202-2.txt
@@ -1,14 +1,10 @@
 To: commits@list.com
-Subject: [SCM] UNNAMED PROJECT branch, topic, deleted. $old_commit_hash
+Subject: [cbas] topic branch deleted. $old_commit_hash
 X-Git-Refname: refs/heads/topic
 X-Git-Reftype: branch
 X-Git-Oldrev: $old_commit_hash
 X-Git-Newrev: 0000000000000000000000000000000000000000
 
-This is an automated email from the git hooks/post-receive script. It was
-generated because a ref change was pushed to the repository containing
-the project "UNNAMED PROJECT".
-
 The branch, topic has been deleted
        was  $old_commit_hash
 
@@ -19,4 +15,4 @@ $old_commit_hash create branch on topic 2
 
 hooks/post-receive
 --
-UNNAMED PROJECT
+cbas

diff --git a/tests/t2202-server-post-receive-email-branches.sh b/tests/t2202-server-post-receive-email-branches.sh
index da2f7c7..ad34ad2 100644 (file)
--- a/tests/t2202-server-post-receive-email-branches.sh
+++ b/tests/t2202-server-post-receive-email-branches.sh
@@ -16,6 +16,7 @@ test_expect_success 'setup' '
        GIT_DIR=./server/.git git config --add hooks.mailinglist commits@list.com &&
        GIT_DIR=./server/.git git config --add hooks.debug true &&
        GIT_DIR=.
+       echo cbas >./server/.git/description
 '
 
 install_server_hook 'post-receive-email' 'post-receive'