zsh-workers
 help / color / mirror / code / Atom feed
From: Wesley Schwengle <wesleys@opperschaap.net>
To: zsh-workers@zsh.org
Subject: [PATCH] completion: _git: Add trailer support for git commit --trailer
Date: Tue, 12 Sep 2023 14:16:49 -0400	[thread overview]
Message-ID: <20230912181650.3193132-1-wesleys@opperschaap.net> (raw)

Via 842587016d717394a001a6f8959475bf8df56124 in the git project there has
been support for git commit trailer tokens for the bash completion
system. This commit adds similar support to zsh.

Signed-off-by: Wesley Schwengle <wesleys@opperschaap.net>
---
 Completion/Unix/Command/_git | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 1d4fe20c9..dd2c1ec74 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -717,7 +717,7 @@ _git-commit () {
     {-p,--patch}'[use the interactive patch selection interface to chose which changes to commit]' \
     '(--reset-author)--author[override the author name used in the commit]:author name' \
     '--date=[override the author date used in the commit]:date' \
-    '*--trailer=[add custom trailer(s)]:trailer' \
+    '*--trailer=[add custom trailer(s)]:trailer :__git_trailers_tokens' \
     '(-s --signoff)'{-s,--signoff}'[add Signed-off-by trailer at the end of the commit message]' \
     '(-n --no-verify)'{-n,--no-verify}'[bypass pre-commit and commit-msg hooks]' \
     '--allow-empty[allow recording an empty commit]' \
@@ -7413,6 +7413,19 @@ __git_deleted_files () {
   __git_files --deleted deleted-files 'deleted file' $*
 }
 
+
+(( $+functions[__git_trailers_tokens] )) ||
+__git_trailers_tokens () {
+  declare -a trailers
+
+  local -a gtrailers=($(git config --name-only --get-regexp trailer.\*.key))
+  for i ("$gtrailers[@]")
+  do
+    trailers+=(${${(@s:.:)i}[2]})
+  done
+  _wanted trailer expl "trailer" compadd -a trailers
+}
+
 (( $+functions[__git_modified_files] )) ||
 __git_modified_files () {
   __git_files --modified modified-files 'modified file' $*
-- 
2.42.0.465.g461bb28fbd



             reply	other threads:[~2023-09-12 18:22 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-12 18:16 Wesley Schwengle [this message]
2023-09-14  2:53 ` [PATCH v2]] completion: _git: Add trailer token completion " Wesley Schwengle

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230912181650.3193132-1-wesleys@opperschaap.net \
    --to=wesleys@opperschaap.net \
    --cc=zsh-workers@zsh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).