post-receive-delivery: add a deliver command

[git-central.git] / tests / t2204-1.txt

diff --git a/tests/t2204-1.txt b/tests/t2204-1.txt
index 4b7d92b..6a9433b 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_abbrev $stable_abbrev
+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(-)