projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
safe_fgets() - even more anal fgets()
[git.git]
/
git-send-email.perl
diff --git
a/git-send-email.perl
b/git-send-email.perl
index
51b7513
..
3f1b3ca
100755
(executable)
--- a/
git-send-email.perl
+++ b/
git-send-email.perl
@@
-34,7
+34,7
@@
my $compose_filename = ".msg.$$";
my (@to,@cc,$initial_reply_to,$initial_subject,@files,$from,$compose);
# Behavior modification variables
my (@to,@cc,$initial_reply_to,$initial_subject,@files,$from,$compose);
# Behavior modification variables
-my ($chain_reply_to, $smtp_server
) = (1, "localhost"
);
+my ($chain_reply_to, $smtp_server
, $quiet) = (1, "localhost", 0
);
# Example reply to:
#$initial_reply_to = ''; #<20050203173208.GA23964@foobar.com>';
# Example reply to:
#$initial_reply_to = ''; #<20050203173208.GA23964@foobar.com>';
@@
-51,6
+51,7
@@
my $rc = GetOptions("from=s" => \$from,
"chain-reply-to!" => \$chain_reply_to,
"smtp-server=s" => \$smtp_server,
"compose" => \$compose,
"chain-reply-to!" => \$chain_reply_to,
"smtp-server=s" => \$smtp_server,
"compose" => \$compose,
+ "quiet" => \$quiet,
);
# Now, let's fill any that aren't set in with defaults:
);
# Now, let's fill any that aren't set in with defaults:
@@
-185,7
+186,9
@@
for my $f (@ARGV) {
}
if (@files) {
}
if (@files) {
- print $_,"\n" for @files;
+ unless ($quiet) {
+ print $_,"\n" for (@files);
+ }
} else {
print <<EOT;
git-send-email [options] <file | directory> [... file | directory ]
} else {
print <<EOT;
git-send-email [options] <file | directory> [... file | directory ]
@@
-212,6
+215,10
@@
Options:
--smtp-server If set, specifies the outgoing SMTP server to use.
Defaults to localhost.
--smtp-server If set, specifies the outgoing SMTP server to use.
Defaults to localhost.
+ --quiet Make git-send-email less verbose. One line per email should be
+ all that is output.
+
+
Error: Please specify a file or a directory on the command line.
EOT
exit(1);
Error: Please specify a file or a directory on the command line.
EOT
exit(1);
@@
-267,8
+274,12
@@
sub send_message
sendmail(%mail) or die $Mail::Sendmail::error;
sendmail(%mail) or die $Mail::Sendmail::error;
- print "OK. Log says:\n", $Mail::Sendmail::log;
- print "\n\n"
+ if ($quiet) {
+ printf "Sent %s\n", $subject;
+ } else {
+ print "OK. Log says:\n", $Mail::Sendmail::log;
+ print "\n\n"
+ }
}
}
@@
-277,7
+288,6
@@
make_message_id();
$subject = $initial_subject;
foreach my $t (@files) {
$subject = $initial_subject;
foreach my $t (@files) {
- my $F = $t;
open(F,"<",$t) or die "can't open file $t";
@cc = ();
open(F,"<",$t) or die "can't open file $t";
@cc = ();
@@
-295,7
+305,7
@@
foreach my $t (@files) {
} elsif (/^(Cc|From):\s+(.*)$/) {
printf("(mbox) Adding cc: %s from line '%s'\n",
} elsif (/^(Cc|From):\s+(.*)$/) {
printf("(mbox) Adding cc: %s from line '%s'\n",
- $2, $_);
+ $2, $_)
unless $quiet
;
push @cc, $2;
}
push @cc, $2;
}
@@
-307,7
+317,7
@@
foreach my $t (@files) {
# So let's support that, too.
if (@cc == 0) {
printf("(non-mbox) Adding cc: %s from line '%s'\n",
# So let's support that, too.
if (@cc == 0) {
printf("(non-mbox) Adding cc: %s from line '%s'\n",
- $_, $_);
+ $_, $_)
unless $quiet
;
push @cc, $_;
push @cc, $_;
@@
-327,7
+337,7
@@
foreach my $t (@files) {
chomp $c;
push @cc, $c;
printf("(sob) Adding cc: %s from line '%s'\n",
chomp $c;
push @cc, $c;
printf("(sob) Adding cc: %s from line '%s'\n",
- $c, $_);
+ $c, $_)
unless $quiet
;
}
}
}
}
}
}