mail.sh: apply more recent updates from contrib/hooks/post-receive-email