summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_git7
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a22bc92e7..7e95051b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2016-01-20 Daniel Shahaf <d.s@daniel.shahaf.name>
+ * 37666: Completion/Unix/Command/_git: Completion: git:
+ 'send-email --smtp-server=' takes absolute path to sendmail.
+
* 37665: Completion/Unix/Command/_git,
Completion/Unix/Type/_absolute_command_paths, Doc/Zsh/compsys.yo:
Completion: New helper _absolute_command_paths.
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index ce3521972..5f137d009 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -3710,7 +3710,7 @@ _git-send-email () {
'--smtp-encryption=[specify encryption method to use]: :__git_sendemail_smtpencryption_values' \
'--smtp-domain=[specify FQDN used in HELO/EHLO]: :_domains' \
'--smtp-pass=[specify password to use for SMTP-AUTH]::password' \
- '--smtp-server=[specify SMTP server to connect to]:smtp server:_hosts' \
+ '--smtp-server=[specify SMTP server to connect to, or sendmail command]: : __git_sendmail_smtpserver_values' \
'--smtp-server-port=[specify port to connect to SMTP server on]:smtp port:_ports' \
'--smtp-server-option=[specify the outgoing SMTP server option to use]:SMPT server option' \
'--smtp-ssl-cert-path=[path to ca-certificates (directory or file)]:ca certificates path:_files' \
@@ -6859,6 +6859,11 @@ __git_sendemail_suppresscc_values () {
all:'avoid all auto Cc values'
}
+(( $+functions[__git_sendmail_smtpserver_values] )) ||
+__git_sendmail_smtpserver_values() {
+ _alternative "smtp hosts:host:_hosts" "sendmail command: :_absolute_command_paths"
+}
+
(( $+functions[__git_colors] )) ||
__git_colors () {
declare -a expl