diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-29 12:52:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-29 12:52:42 -0800 |
| commit | 175bd3b0d0aef3af1bf2595840eebd7af9c1d1a5 (patch) | |
| tree | 389fdd0eb6fcd9a3e664fcc079cd04372add079d /t | |
| parent | 03a23a46c5079033300f792f7a76464f0c818733 (diff) | |
| parent | 8cac13dccbf78005f1579bf22dbac1bfe27e1572 (diff) | |
| download | git-175bd3b0d0aef3af1bf2595840eebd7af9c1d1a5.tar.gz | |
Merge branch 'fc/send-email-no-sender-prompt'
* fc/send-email-no-sender-prompt:
send-email: avoid questions when user has an ident
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9001-send-email.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 6c6af7d13f..c5d66cf386 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -191,14 +191,13 @@ test_expect_success $PREREQ 'Show all headers' ' test_expect_success $PREREQ 'Prompting works' ' clean_fake_sendmail && - (echo "Example <from@example.com>" - echo "to@example.com" + (echo "to@example.com" echo "" ) | GIT_SEND_EMAIL_NOTTY=1 git send-email \ --smtp-server="$(pwd)/fake.sendmail" \ $patches \ 2>errors && - grep "^From: Example <from@example.com>\$" msgtxt1 && + grep "^From: A U Thor <author@example.com>\$" msgtxt1 && grep "^To: to@example.com\$" msgtxt1 ' |