[or-cvs] [githax/master] Remove the old "Approved" header logic.

[Nick Mathewson]

Author: Nick Mathewson <nickm at torproject.org>
Subject: Remove the old "Approved" header logic.

The ssh user's email is now the one we use.  We don't need to munge
an approved header into each email in order to cope with stuff being
"From" the patch author.

As a special bonus, we also now know who committed what.
---
 hooks/post-receive-diff |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/hooks/post-receive-diff b/hooks/post-receive-diff
index 1a255a7..1b8c106 100755
--- a/hooks/post-receive-diff
+++ b/hooks/post-receive-diff
@@ -24,9 +24,6 @@
 
 recipients=$(git config hooks.mailinglist)
 projectname=$(git config hooks.projectname)
-H_EXTRA=djgg34554
-H_EXTRA="ved: $H_EXTRA"
-H_EXTRA="Appro$H_EXTRA"
 
 if [ -z "$recipients" ]; then
     echo >&2 '[hooks/post-receive] Error: hooks.mailinglist not specified'
@@ -51,5 +48,5 @@ while read oldrev newrev refname; do
 
     git-format-patch --subject-prefix="$projectname/${refname#refs/heads/}" \
 		     --stdout "$oldrev..$newrev" |
-		     formail -s /home/or/git-helpers/copyheaders.pl | formail -i "$H_EXTRA" -I "To: $recipients" -R From: Patch-Author: -I "From " -s /usr/sbin/sendmail -t
+		     formail -s /home/or/git-helpers/copyheaders.pl | formail -I "To: $recipients" -R From: Patch-Author: -I "From " -s /usr/sbin/sendmail -t
 done
-- 
1.5.6.5