admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dd/send-email-config'

Browse Source 
Stop when "sendmail.*" configuration variables are defined, which
could be a mistaken attempt to define "sendemail.*" variables.

* dd/send-email-config:
  git-send-email: die if sendmail.* config is set
This commit is contained in:
Junio C Hamano
2020-08-17 17:02:41 -07:00
parent 5676db2612 dd84e528a3
commit a00bda2b2f
4 changed files with 68 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
t/t9001-send-email.sh
View File

@@ -2142,4 +2142,33 @@ test_expect_success $PREREQ 'test that send-email works outside a repo' '
"$(pwd)/0001-add-master.patch"
'
test_expect_success $PREREQ 'test that sendmail config is rejected' '
test_config sendmail.program sendmail &&
test_must_fail git send-email \
--from="Example <nobody@example.com>" \
--to=nobody@example.com \
--smtp-server="$(pwd)/fake.sendmail" \
HEAD^ 2>err &&
test_i18ngrep "found configuration options for '"'"sendmail"'"'" err
'
test_expect_success $PREREQ 'test that sendmail config rejection is specific' '
test_config resendmail.program sendmail &&
git send-email \
--from="Example <nobody@example.com>" \
--to=nobody@example.com \
--smtp-server="$(pwd)/fake.sendmail" \
HEAD^
'
test_expect_success $PREREQ 'test forbidSendmailVariables behavior override' '
test_config sendmail.program sendmail &&
test_config sendemail.forbidSendmailVariables false &&
git send-email \
--from="Example <nobody@example.com>" \
--to=nobody@example.com \
--smtp-server="$(pwd)/fake.sendmail" \
HEAD^
'
test_done