Signed-off-by: Alexander Kuleshov <kuleshovmail@xxxxxxxxx> --- git-send-email.perl | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 82c6fea..eb02ef9 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -38,7 +38,7 @@ sub new { } sub readline { my $self = shift; - die "Cannot use readline on FakeTerm: $$self"; + die "Cannot use readline on FakeTerm: $$self\n"; } package main; @@ -185,13 +185,13 @@ sub do_edit { map { system('sh', '-c', $editor.' "$@"', $editor, $_); if (($? & 127) || ($? >> 8)) { - die("the editor exited uncleanly, aborting everything"); + die("the editor exited uncleanly, aborting everything\n"); } } @_; } else { system('sh', '-c', $editor.' "$@"', $editor, @_); if (($? & 127) || ($? >> 8)) { - die("the editor exited uncleanly, aborting everything"); + die("the editor exited uncleanly, aborting everything\n"); } } } @@ -546,7 +546,7 @@ while (defined(my $f = shift @ARGV)) { @ARGV = (); } elsif (-d $f and !is_format_patch_arg($f)) { opendir my $dh, $f - or die "Failed to opendir $f: $!"; + or die "Failed to opendir $f: $!\n"; push @files, grep { -f $_ } map { catfile($f, $_) } sort readdir $dh; @@ -591,7 +591,7 @@ sub get_patch_subject { return "GIT: $1\n"; } close $fh; - die "No subject line in $fn ?"; + die "No subject line in $fn ?\n"; } if ($compose) { @@ -601,7 +601,7 @@ if ($compose) { tempfile(".gitsendemail.msg.XXXXXX", DIR => $repo->repo_path()) : tempfile(".gitsendemail.msg.XXXXXX", DIR => "."))[1]; open my $c, ">", $compose_filename - or die "Failed to open for writing $compose_filename: $!"; + or die "Failed to open for writing $compose_filename: $!\n"; my $tpl_sender = $sender || $repoauthor || $repocommitter || ''; @@ -1205,7 +1205,7 @@ X-Mailer: git-send-email $gitversion $_ = ask("Send this email? ([y]es|[n]o|[q]uit|[a]ll): ", valid_re => qr/^(?:yes|y|no|n|quit|q|all|a)/i, default => $ask_default); - die "Send this email reply required" unless defined $_; + die "Send this email reply required\n" unless defined $_; if (/^n/i) { return 0; } elsif (/^q/i) { @@ -1231,7 +1231,7 @@ X-Mailer: git-send-email $gitversion } else { if (!defined $smtp_server) { - die "The required SMTP server is not properly defined." + die "The required SMTP server is not properly defined.\n" } if ($smtp_encryption eq 'ssl') { @@ -1274,11 +1274,11 @@ X-Mailer: git-send-email $gitversion } if (!$smtp) { - die "Unable to initialize SMTP properly. Check config and use --smtp-debug. ", - "VALUES: server=$smtp_server ", - "encryption=$smtp_encryption ", - "hello=$smtp_domain", - defined $smtp_server_port ? " port=$smtp_server_port" : ""; + die "Unable to initialize SMTP properly. Check config and use --smtp-debug.\n", + "VALUES: server=$smtp_server\n\t", + "encryption=$smtp_encryption\n\t", + "hello=$smtp_domain\n\t", + defined $smtp_server_port ? "port=$smtp_server_port\n" : "\n"; } smtp_auth_maybe or die $smtp->message; @@ -1321,7 +1321,7 @@ $subject = $initial_subject; $message_num = 0; foreach my $t (@files) { - open my $fh, "<", $t or die "can't open file $t"; + open my $fh, "<", $t or die "can't open file $t\n"; my $author = undef; my $sauthor = undef; @@ -1543,7 +1543,7 @@ sub recipients_cmd { my @addresses = (); open my $fh, "-|", "$cmd \Q$file\E" - or die "($prefix) Could not execute '$cmd'"; + or die "($prefix) Could not execute '$cmd'\n"; while (my $address = <$fh>) { $address =~ s/^\s*//g; $address =~ s/\s*$//g; @@ -1554,7 +1554,7 @@ sub recipients_cmd { $what, $address, $cmd) unless $quiet; } close $fh - or die "($prefix) failed to close pipe to '$cmd'"; + or die "($prefix) failed to close pipe to '$cmd'\n"; return @addresses; } @@ -1581,7 +1581,7 @@ sub apply_transfer_encoding { $message = MIME::Base64::decode($message) if ($from eq 'base64'); - die "cannot send message as 7bit" + die "cannot send message as 7bit\n" if ($to eq '7bit' and $message =~ /[^[:ascii:]]/); return $message if ($to eq '7bit' or $to eq '8bit'); @@ -1589,7 +1589,7 @@ sub apply_transfer_encoding { if ($to eq 'quoted-printable'); return MIME::Base64::encode($message, "\n") if ($to eq 'base64'); - die "invalid transfer encoding"; + die "invalid transfer encoding\n"; } sub unique_email_list { -- 2.2.1.202.g98acd41.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html