mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
Merge branch 'maint'
* maint: Do not over-quote the -f envelopesender value. unexpected Make output (e.g. from --debug) causes build failure Fixed minor typo in t/t9001-send-email.sh test command line.
This commit is contained in:
commit
41ef95aea7
2
Makefile
2
Makefile
|
@ -805,7 +805,7 @@ perl/perl.mak: GIT-CFLAGS
|
|||
|
||||
$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
|
||||
$(QUIET_GEN)$(RM) $@ $@+ && \
|
||||
INSTLIBDIR=`$(MAKE) -C perl -s --no-print-directory instlibdir` && \
|
||||
INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
|
||||
sed -e '1{' \
|
||||
-e ' s|#!.*perl|#!$(PERL_PATH_SQ)|' \
|
||||
-e ' h' \
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -30,7 +30,7 @@ test_expect_success 'Extract patches' '
|
|||
'
|
||||
|
||||
test_expect_success 'Send patches' '
|
||||
git send-email -from="Example <nobody@example.com>" --to=nobody@example.com --smtp-server="$(pwd)/fake.sendmail" $patches 2>errors
|
||||
git send-email --from="Example <nobody@example.com>" --to=nobody@example.com --smtp-server="$(pwd)/fake.sendmail" $patches 2>errors
|
||||
'
|
||||
|
||||
cat >expected <<\EOF
|
||||
|
|
Loading…
Reference in a new issue