mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-28 18:32:37 +02:00
Code

send-email: do not pass bogus address to local sendmail binary

Browse Source 
This makes t9001 test happy.  Also fixes the warning on
uninitialized $references variable again.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-05-29 23:53:13 -07:00
parent ce903018f1
commit 2186d566a6
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-send-email.perl
View File

@ -387,7 +387,9 @@ X-Mailer: git-send-email $gitversion
my $pid = open my $sm, '|-';
defined $pid or die $!;
if (!$pid) {
exec($smtp_server,'-i',@recipients) or die $!;
exec($smtp_server,'-i',
map { scalar extract_valid_address($_) }
@recipients) or die $!;
}
print $sm "$header\n$message";
close $sm or die $?;
@ -420,7 +422,7 @@ X-Mailer: git-send-email $gitversion
}
$reply_to = $initial_reply_to;
$references = $initial_reply_to;
$references = $initial_reply_to || '';
make_message_id();
$subject = $initial_subject;

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

@ -13,10 +13,14 @@ test_expect_success \
test_expect_success \
'Setup helper tool' \
'echo "#!/bin/sh" > fake.sendmail
echo "shift" >> fake.sendmail
echo "echo \"\$*\" > commandline" >> fake.sendmail
echo "cat > msgtxt" >> fake.sendmail
'(echo "#!/bin/sh"
echo shift
echo for a
echo do
echo " echo \"!\$a!\""
echo "done >commandline"
echo "cat > msgtxt"
) >fake.sendmail
chmod +x ./fake.sendmail
git add fake.sendmail
GIT_AUTHOR_NAME="A" git commit -a -m "Second."'
@ -26,9 +30,12 @@ test_expect_success \
'git format-patch -n HEAD^1
git send-email -from="Example <nobody@example.com>" --to=nobody@example.com --smtp-server="$(pwd)/fake.sendmail" ./0001*txt'
cat >expected <<\EOF
!nobody@example.com!
!author@example.com!
EOF
test_expect_success \
'Verify commandline' \
'cline=$(cat commandline)
[ "$cline" == "nobody@example.com author@example.com" ]'
'diff commandline expected'
test_done