diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-28 10:50:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-28 10:50:20 -0800 |
| commit | 3b16b3702ac3da91cee3f74fdf8620289e0e8f14 (patch) | |
| tree | 62e1a57a0e6f62db751e496bf4d1e1ea4710ea0d /t | |
| parent | 879ed7539357cf54e1c14f1c203eacd74469ff4c (diff) | |
| parent | 8cac13dccbf78005f1579bf22dbac1bfe27e1572 (diff) | |
| download | git-3b16b3702ac3da91cee3f74fdf8620289e0e8f14.tar.gz git-3b16b3702ac3da91cee3f74fdf8620289e0e8f14.tar.xz | |
Merge branch 'fc/send-email-no-sender-prompt' into jk/send-email-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 6c6af7d13..c5d66cf38 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 ' |