diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-25 00:30:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-25 00:30:33 -0700 |
| commit | 41ef95aea7c8d8a337af693b601511e099cc468f (patch) | |
| tree | 7c108f9cd0a30983f3397491763c85507e0b2875 | |
| parent | bc12651b08fe295ac5647208f9b3f946145cc9b1 (diff) | |
| parent | d1637a07f684acd80007723f94c4da9649d85525 (diff) | |
| download | git-41ef95aea7c8d8a337af693b601511e099cc468f.tar.gz git-41ef95aea7c8d8a337af693b601511e099cc468f.tar.xz | |
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.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | contrib/hooks/post-receive-email | 16 | ||||
| -rwxr-xr-x | t/t9001-send-email.sh | 2 |
3 files changed, 12 insertions, 8 deletions
@@ -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' \ diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email index c589a39a0..1f88099df 100644 --- a/contrib/hooks/post-receive-email +++ b/contrib/hooks/post-receive-email @@ -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 diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index e9ea33c18..83f947020 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -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 |