send-email: make annotate configurable

Some people always do --annotate, lets not force them to always type
that.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index f79184c0a83170ea54298f2b8ac960372371b0f3..50840aab5e9b8c525271d171f719ff6bda3580b0 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1998,6 +1998,7 @@ sendemail.<identity>.*::
 
 sendemail.aliasesfile::
 sendemail.aliasfiletype::
 
 sendemail.aliasesfile::
 sendemail.aliasfiletype::

+sendemail.annotate::

 sendemail.bcc::
 sendemail.cc::
 sendemail.cccmd::
 sendemail.bcc::
 sendemail.cc::
 sendemail.cccmd::

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 0cffef8aa51cc5c2f34393e39e45e84c4997b195..40a9a9abc14f175738986b244207655b296cc31d 100644 (file)
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -45,8 +45,9 @@ Composing
 ~~~~~~~~~
 
 --annotate::
 ~~~~~~~~~
 
 --annotate::

-       Review and edit each patch you're about to send. See the
-       CONFIGURATION section for 'sendemail.multiedit'.
+       Review and edit each patch you're about to send. Default is the value
+       of 'sendemail.annotate'. See the CONFIGURATION section for
+       'sendemail.multiedit'.

 
 --bcc=<address>::
        Specify a "Bcc:" value for each email. Default is the value of
 
 --bcc=<address>::
        Specify a "Bcc:" value for each email. Default is the value of

diff --git a/git-send-email.perl b/git-send-email.perl
index 729747281864155bee7ef009de3ab92cc7643a89..bd13cc812d2a0115edcdd2c3ec146665ddfc5e29 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -54,7 +54,7 @@ sub usage {
     --[no-]bcc              <str>  * Email Bcc:
     --subject               <str>  * Email "Subject:"
     --in-reply-to           <str>  * Email "In-Reply-To:"
     --[no-]bcc              <str>  * Email Bcc:
     --subject               <str>  * Email "Subject:"
     --in-reply-to           <str>  * Email "In-Reply-To:"

-    --annotate                     * Review each patch that will be sent in an editor.
+    --[no-]annotate                * Review each patch that will be sent in an editor.

     --compose                      * Open an editor for introduction.
     --compose-encoding      <str>  * Encoding to assume for introduction.
     --8bit-encoding         <str>  * Encoding to assume 8bit mails if undeclared
     --compose                      * Open an editor for introduction.
     --compose-encoding      <str>  * Encoding to assume for introduction.
     --8bit-encoding         <str>  * Encoding to assume 8bit mails if undeclared


@@ -212,7 +212,8 @@ sub do_edit {
     "signedoffbycc" => [\$signed_off_by_cc, undef],
     "signedoffcc" => [\$signed_off_by_cc, undef],      # Deprecated
     "validate" => [\$validate, 1],
     "signedoffbycc" => [\$signed_off_by_cc, undef],
     "signedoffcc" => [\$signed_off_by_cc, undef],      # Deprecated
     "validate" => [\$validate, 1],

-    "multiedit" => [\$multiedit, undef]
+    "multiedit" => [\$multiedit, undef],
+    "annotate" => [\$annotate, undef]

 );
 
 my %config_settings = (
 );
 
 my %config_settings = (


@@ -304,7 +305,7 @@ sub signal_handler {
                    "smtp-debug:i" => \$debug_net_smtp,
                    "smtp-domain:s" => \$smtp_domain,
                    "identity=s" => \$identity,
                    "smtp-debug:i" => \$debug_net_smtp,
                    "smtp-domain:s" => \$smtp_domain,
                    "identity=s" => \$identity,

-                   "annotate" => \$annotate,
+                   "annotate!" => \$annotate,

                    "compose" => \$compose,
                    "quiet" => \$quiet,
                    "cc-cmd=s" => \$cc_cmd,
                    "compose" => \$compose,
                    "quiet" => \$quiet,
                    "cc-cmd=s" => \$cc_cmd,