From: Junio C Hamano <gitster@pobox.com>
To: Lars Noschinski <lars@public.noschinski.de>
Cc: git@vger.kernel.org, andyparkins@gmail.com, pape@smarden.org,
gitster@pobox.com
Subject: Re: [PATCH] post-receive-email: do not call sendmail if no mail was generated
Date: Tue, 08 Sep 2009 13:15:13 -0700 [thread overview]
Message-ID: <7v4ord19da.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1252436418-7660-1-git-send-email-lars@public.noschinski.de> (Lars Noschinski's message of "Tue\, 8 Sep 2009 21\:00\:18 +0200")
Lars Noschinski <lars@public.noschinski.de> writes:
> contrib/hooks/post-receive-email used to call the send_mail function
> (and thus, /usr/sbin/sendmail), even if generate_mail generated no
> output. This is problematic, as the sendmail binary provided by exim4
> generates an error mail if provided with an empty input.
I actually have a bigger question, not about the implementation but about
the cause.
If generate_email results in an empty output in this codepath:
# Check if we've got anyone to send to
if [ -z "$recipients" ]; then
...
echo >&2 "*** $config_name is not set so no email will be sent"
echo >&2 "*** for $refname update $oldrev->$newrev"
exit 0
fi
shouldn't we rather receive an error e-mail than let the
misconfiguration go undetected?
Before this check, I do not see anywhere generate_email would return nor
exit, and after this check, there is a call to generate_email_header and
that guarantees that the output from the generate_email function is not
empty, so it looks to me that triggering this check is the only case your
patch would change the behaviour of the script.
It looks to me that your exim error mail is actually reporting a
legitimate problem you would want to fix in your configuration.
> Therefore, we now read one line ourselves and use the result to decide
> if we really want to call /usr/sbin/sendmail.
> ---
> contrib/hooks/post-receive-email | 11 +++++++++++
> 1 files changed, 11 insertions(+), 0 deletions(-)
>
> Two things changed:
>
> - we do not read the whole mail in a shell variable
> - the decision whether to call sendmail is based on the output generated
> by generate_mail, not its return code
>
> diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
> index 2a66063..c855c31 100755
> --- a/contrib/hooks/post-receive-email
> +++ b/contrib/hooks/post-receive-email
> @@ -637,6 +637,16 @@ show_new_revisions()
>
> send_mail()
> {
> + OIFS=$IFS
> + IFS='
> +'
> + read FIRSTLINE || exit 1
Shouldn't this be merely a "return"? The caller looks like this:
while read oldrev newrev refname
do
generate_email $oldrev $newrev $refname | send_mail
done
and you would not want to stop after punting to report on the first ref.
> + (printf $FIRSTLINE'\n'; cat) | call_sendmail
> + IFS=$OLD_IFS
> +}
> +
> +call_sendmail()
> +{
> if [ -n "$envelopesender" ]; then
> /usr/sbin/sendmail -t -f "$envelopesender"
> else
> @@ -644,6 +654,7 @@ send_mail()
> fi
> }
>
> +
> # ---------------------------- main()
>
> # --- Constants
Why?
next prev parent reply other threads:[~2009-09-08 20:15 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-28 17:39 [PATCH] post-receive-email: do not call sendmail if no mail was generated Lars Noschinski
2009-09-08 9:20 ` Lars Noschinski
2009-09-08 16:57 ` Junio C Hamano
2009-09-08 18:55 ` Lars Noschinski
2009-09-08 19:00 ` Lars Noschinski
2009-09-08 20:15 ` Junio C Hamano [this message]
2009-09-08 20:59 ` Lars Noschinski
2009-09-08 21:49 ` Junio C Hamano
2009-09-08 21:12 ` Andy Parkins
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v4ord19da.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=andyparkins@gmail.com \
--cc=git@vger.kernel.org \
--cc=lars@public.noschinski.de \
--cc=pape@smarden.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).