The sender address, as specified with the '--from' command line option,
couldn't be set in the config file. So add a new config option,
'sendemail.from', which sets it. One can use 'sendemail.<identity>.from'
as well of course, which is likely the more useful case.
The sender address would default to GIT_AUTHOR_IDENT, which is usually the
right thing, but this doesn't allow switching based on the identity
selected. It's possible to switch the SMTP server and envelope sender by
using the '--identity' option, in which case one probably wants to use a
different from address as well, but this had to be manually specified.
The docs are also fixed up somewhat. If '--from' is specified (or the new
sendemail.from option is used) then the user isn't prompted. The default
with no '--from' option (or sendemail.from option) is GIT_AUTHOR_IDENT
first then GIT_COMMITTER_IDENT, not just GIT_COMMITTER_IDENT.
Signed-off-by: Trent Piepho <xyzzy@xxxxxxxxxxxxx>
---
Documentation/git-send-email.txt | 9 ++++++---
git-send-email.perl | 1 +
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index ff4aeff..8345df2 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -57,9 +57,12 @@ If it wasn't able to see a header in the summary it will ask you about it
interactively after quitting your editor.
--from::
- Specify the sender of the emails. This will default to
- the value GIT_COMMITTER_IDENT, as returned by "git var -l".
- The user will still be prompted to confirm this entry.
+ Specify the sender of the emails. If not specified on the command line,
+ the value of the 'sendemail.from' configuration option is used. If
+ neither the command line option nor 'sendemail.from' are set, then the
+ user will be prompted for the value. The default for the prompt will be
+ the value of GIT_AUTHOR_IDENT, or GIT_COMMITTER_IDENT if that is not
+ set, as returned by "git var -l".
--in-reply-to::
Specify the contents of the first In-Reply-To header.
diff --git a/git-send-email.perl b/git-send-email.perl
index 77ca8fe..ec58f12 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -207,6 +207,7 @@ my %config_settings = (
"suppresscc" => \@suppress_cc,
"envelopesender" => \$envelope_sender,
"multiedit" => \$multiedit,
+ "from" => \$sender,
);
# Handle Uncouth Termination
--
1.5.4.1
--
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
