Do not over-quote the -f envelopesender value.
Without this, the value passed to sendmail would have an extra set of single quotes. At least exim's sendmail emulation would object to that: exim: bad -f address "'list-addr@example.org'": malformed address: ' \ may not follow 'list-addr@example.org error: hooks/post-receive exited with error code 1 Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jim Meyering committed
Sep 25, 2007 at 08:48 UTC
d1637a07f684acd80007723f94c4da9649d85525
1 file changed
+10
-6
contrib/hooks/post-receive-email
+10
-6
@@ -571,6 +571,15 @@ generate_delete_general_email()
571
echo $LOGEND
572
}
573
574
+send_mail()
575
+{
576
+ if [ -n "$envelopesender" ]; then
577
+ /usr/sbin/sendmail -t -f "$envelopesender"
578
+ else
579
+ /usr/sbin/sendmail -t
580
+ fi
581
+}
582
+
583
# ---------------------------- main()
584
585
# --- Constants
@@ -607,13 +616,8 @@ if [ -n "$1" -a -n "$2" -a -n "$3" ]; then
616
# resend an email; they could redirect the output to sendmail themselves
617
PAGER= generate_email $2 $3 $1
618
else
610
- if [ -n "$envelopesender" ]; then
611
- envelopesender="-f '$envelopesender'"
612
- fi
613
-
619
while read oldrev newrev refname
620
do
616
- generate_email $oldrev $newrev $refname |
617
- /usr/sbin/sendmail -t $envelopesender
621
+ generate_email $oldrev $newrev $refname | send_mail
622
done
623
fi