[PATCH 5/5] git send-email: turn --compose on when more than one patch.
From: Pierre Habouzit <hidden>
Date: 2016-06-15 22:45:36
Subsystem:
the rest · Maintainer:
Linus Torvalds
Automatically turn --compose on when there is more than one patch, and that the output is a tty. Do not print the list of files sent anymore in that case, as the list is shown in the summary editor. Signed-off-by: Pierre Habouzit <redacted> --- git-send-email.perl | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index fd72127..3c7818f 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl@@ -51,7 +51,7 @@ git send-email [options] <file | directory | rev-list options > --subject <str> * Email "Subject:" --in-reply-to <str> * Email "In-Reply-To:" --annotate * Review each patch that will be sent in an editor. - --compose * Open an editor for introduction. + --[no-]compose * Open an editor for introduction. Sending: --envelope-sender <str> * Email envelope sender.
@@ -237,7 +237,7 @@ my $rc = GetOptions("sender|from=s" => \$sender, "smtp-encryption=s" => \$smtp_encryption, "identity=s" => \$identity, "annotate" => \$annotate, - "compose" => \$compose, + "compose!" => \$compose, "quiet" => \$quiet, "cc-cmd=s" => \$cc_cmd, "suppress-from!" => \$suppress_from,
@@ -425,7 +425,11 @@ if ($validate) { } if (@files) { - unless ($quiet) { + if (!defined($compose) && -t STDOUT) { + # turn $compose on if there is more than one file + $compose = $#files; + } + unless ($quiet || $compose) { print $_,"\n" for (@files); } } else {
--
1.5.6.5