From: Stephen Haberman Date: Thu, 21 Aug 2008 19:50:37 +0000 (-0500) Subject: I never really liked the footer. X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=f186841151d4ec910d4abbc22c93cd8310538705;p=git-central.git I never really liked the footer. --- diff --git a/server/post-receive-email b/server/post-receive-email index 4f1dcf4..df8bdfe 100755 --- a/server/post-receive-email +++ b/server/post-receive-email @@ -58,7 +58,6 @@ # - generate_create_XXXX_email # - generate_update_XXXX_email # - generate_delete_XXXX_email -# - generate_email_footer # generate_email() { @@ -133,7 +132,6 @@ generate_email() generate_email_header generate_${change_type}_${function}_email - generate_email_footer } generate_email_header() @@ -153,16 +151,6 @@ generate_email_header() EOF } -generate_email_footer() -{ - cat <<-EOF - - - hooks/post-receive - -- - $projectdesc - EOF -} # --------------- Branches diff --git a/tests/t2200-1.txt b/tests/t2200-1.txt index c462cfe..6a2e503 100644 --- a/tests/t2200-1.txt +++ b/tests/t2200-1.txt @@ -34,8 +34,3 @@ index 146f275..b38f23c 100644 @@ -1 +1 @@ -setup +simple commit - - -hooks/post-receive --- -cbas diff --git a/tests/t2201-1.txt b/tests/t2201-1.txt index 633c311..9c92c37 100644 --- a/tests/t2201-1.txt +++ b/tests/t2201-1.txt @@ -19,8 +19,3 @@ A U Thor (1): setup ----------------------------------------------------------------------- - - -hooks/post-receive --- -cbas diff --git a/tests/t2201-2.txt b/tests/t2201-2.txt index 7d962ab..6e8a611 100644 --- a/tests/t2201-2.txt +++ b/tests/t2201-2.txt @@ -41,8 +41,3 @@ index 146f275..7d07572 100644 @@ -1 +1 @@ -setup +commit on annotated tagged branch 2 - - -hooks/post-receive --- -cbas diff --git a/tests/t2201-3.txt b/tests/t2201-3.txt index e6cd956..71de2a7 100644 --- a/tests/t2201-3.txt +++ b/tests/t2201-3.txt @@ -21,8 +21,3 @@ A U Thor (2): commit on annotated tagged branch 2 ----------------------------------------------------------------------- - - -hooks/post-receive --- -cbas diff --git a/tests/t2201-4.txt b/tests/t2201-4.txt index 8b07459..af4bc95 100644 --- a/tests/t2201-4.txt +++ b/tests/t2201-4.txt @@ -16,8 +16,3 @@ Date: $new_commit_date create lightweight tag ----------------------------------------------------------------------- - - -hooks/post-receive --- -cbas diff --git a/tests/t2201-5.txt b/tests/t2201-5.txt index 0c24e42..bdc6c1c 100644 --- a/tests/t2201-5.txt +++ b/tests/t2201-5.txt @@ -17,8 +17,3 @@ Date: $new_commit_date force update lightweight tag ----------------------------------------------------------------------- - - -hooks/post-receive --- -cbas diff --git a/tests/t2201-6.txt b/tests/t2201-6.txt index 9518253..9bbbb78 100644 --- a/tests/t2201-6.txt +++ b/tests/t2201-6.txt @@ -12,8 +12,3 @@ The tag, 2.1 has been deleted ----------------------------------------------------------------------- $old_commit_hash force update lightweight tag ----------------------------------------------------------------------- - - -hooks/post-receive --- -cbas diff --git a/tests/t2201-7.txt b/tests/t2201-7.txt index b1b4ece..4a45321 100644 --- a/tests/t2201-7.txt +++ b/tests/t2201-7.txt @@ -23,8 +23,3 @@ A U Thor (3): force update annotated tag ----------------------------------------------------------------------- - - -hooks/post-receive --- -cbas diff --git a/tests/t2201-8.txt b/tests/t2201-8.txt index 90b5925..cf26a25 100644 --- a/tests/t2201-8.txt +++ b/tests/t2201-8.txt @@ -17,8 +17,3 @@ Date: $old_tag_date 2.0 $new_commit_hash force update annotated tag ----------------------------------------------------------------------- - - -hooks/post-receive --- -cbas diff --git a/tests/t2202-1.txt b/tests/t2202-1.txt index 9c9d31a..8a44ccc 100644 --- a/tests/t2202-1.txt +++ b/tests/t2202-1.txt @@ -35,8 +35,3 @@ index 146f275..8516a40 100644 @@ -1 +1 @@ -setup +create branch 2 - - -hooks/post-receive --- -cbas diff --git a/tests/t2202-2.txt b/tests/t2202-2.txt index e116118..573f010 100644 --- a/tests/t2202-2.txt +++ b/tests/t2202-2.txt @@ -12,8 +12,3 @@ The branch, topic has been deleted ----------------------------------------------------------------------- $old_commit_hash rewind and continue branch on topic ----------------------------------------------------------------------- - - -hooks/post-receive --- -cbas diff --git a/tests/t2202-3.txt b/tests/t2202-3.txt index 27c82d7..e175c3f 100644 --- a/tests/t2202-3.txt +++ b/tests/t2202-3.txt @@ -13,8 +13,3 @@ The branch, topic2 has been created ----------------------------------------------------------------------- Summary of changes: - - -hooks/post-receive --- -cbas diff --git a/tests/t2202-4.txt b/tests/t2202-4.txt index 02a5d66..5916d3b 100644 --- a/tests/t2202-4.txt +++ b/tests/t2202-4.txt @@ -28,8 +28,3 @@ index 8516a40..5c0be09 100644 @@ -1 +1 @@ -create branch 2 +update branch with existing commits does not replay them - - -hooks/post-receive --- -cbas diff --git a/tests/t2202-5.txt b/tests/t2202-5.txt index 5aece3f..634a0ee 100644 --- a/tests/t2202-5.txt +++ b/tests/t2202-5.txt @@ -32,8 +32,3 @@ index 5c0be09..8516a40 100644 @@ -1 +1 @@ -update branch with existing commits does not replay them +create branch 2 - - -hooks/post-receive --- -cbas diff --git a/tests/t2202-6.txt b/tests/t2202-6.txt index 8b93e3b..eb0f086 100644 --- a/tests/t2202-6.txt +++ b/tests/t2202-6.txt @@ -47,8 +47,3 @@ index 8516a40..a30ab5b 100644 @@ -1 +1 @@ -create branch 2 +rewind and continue branch - - -hooks/post-receive --- -cbas diff --git a/tests/t2203-1.txt b/tests/t2203-1.txt index 843e2ba..1c96334 100644 --- a/tests/t2203-1.txt +++ b/tests/t2203-1.txt @@ -51,8 +51,3 @@ index 146f275..1c043c5 100644 @@ -1 +1 @@ -setup +merge in stable 2 - - -hooks/post-receive --- -cbas diff --git a/tests/t2203-2.txt b/tests/t2203-2.txt index ac8ba9a..5b0ad73 100644 --- a/tests/t2203-2.txt +++ b/tests/t2203-2.txt @@ -54,8 +54,3 @@ index 1c043c5..96d4816 100644 @@ -1 +1 @@ -merge in stable 2 +merge in stable with conflict 2 - - -hooks/post-receive --- -cbas