X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fhooks%2Fpost-receive-email;h=1f88099df4b2213c0dca58b22567bc1d91e4adc2;hb=3a229177f9919e80e638ac77f861cb5a5c911e1d;hp=d1bef9125bca0997e0e714b3f89e9c2df307d598;hpb=39231b1c32caee10c7ac3397341ea0c6cf56e7f9;p=git.git

diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
index d1bef9125..1f88099df 100644
--- a/contrib/hooks/post-receive-email
+++ b/contrib/hooks/post-receive-email
@@ -199,7 +199,7 @@ generate_email_footer()
 
 
 	hooks/post-receive
-	-- 
+	--
 	$projectdesc
 	EOF
 }
@@ -571,6 +571,15 @@ generate_delete_general_email()
 	echo $LOGEND
 }
 
+send_mail()
+{
+	if [ -n "$envelopesender" ]; then
+		/usr/sbin/sendmail -t -f "$envelopesender"
+	else
+		/usr/sbin/sendmail -t
+	fi
+}
+
 # ---------------------------- main()
 
 # --- Constants
@@ -607,13 +616,8 @@ if [ -n "$1" -a -n "$2" -a -n "$3" ]; then
 	# resend an email; they could redirect the output to sendmail themselves
 	PAGER= generate_email $2 $3 $1
 else
-	if [ -n "$envelopesender" ]; then
-		envelopesender="-f '$envelopesender'"
-	fi
-
 	while read oldrev newrev refname
 	do
-		generate_email $oldrev $newrev $refname |
-		/usr/sbin/sendmail -t $envelopesender
+		generate_email $oldrev $newrev $refname | send_mail
 	done
 fi