Merge branch 'master' of ssh://git.onelab.eu/git/infrastructure

diff --git a/scripts/post-receive-email-with-diffs b/scripts/post-receive-email-with-diffs
index 6f42e95..feb7750 100755 (executable)
--- 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"
 }