From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Tue, 22 Jun 2010 15:53:46 +0000 (+0200)
Subject: fix from email
X-Git-Tag: foo~95^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=80b5d7009568cd0a9ee3b50439f277ab49133a6c;p=infrastructure.git

fix from email
---

diff --git a/scripts/post-receive-email-with-diffs b/scripts/post-receive-email-with-diffs
index 6f42e95..feb7750 100755
--- a/scripts/post-receive-email-with-diffs
+++ b/scripts/post-receive-email-with-diffs
@@ -599,7 +599,11 @@ send_mail()
 {
 	COMMITTER=$(git-for-each-ref --format='%(committer)' --sort=-committerdate count=1 refs/heads)
 	COMMITTERNAME=$(cut -d'<' -f1 <<< $COMMITTER)
-	COMMITTERMAIL=$(cut -d'<' -f2 <<< $COMMITTER |cut -d'>' -f1)
+	if [ -n "$envelopesender" ] ; then
+            COMMITTERMAIL=$envelopesender
+        else
+	    COMMITTERMAIL=$(cut -d'<' -f2 <<< $COMMITTER |cut -d'>' -f1)
+        fi
 	/usr/sbin/sendmail -t -f "$COMMITTERMAIL" -F "$COMMITTERNAME"
 }