From: Junio C Hamano <gitster@pobox.com>
To: Roland Hieber <rhi@pengutronix.de>
Cc: git@vger.kernel.org, Denton Liu <liu.denton@gmail.com>
Subject: Re: [PATCH v3 1/3] completion: add 'symbolic-ref'
Date: Thu, 25 Apr 2024 09:50:28 -0700 [thread overview]
Message-ID: <xmqqcyqdgze3.fsf@gitster.g> (raw)
In-Reply-To: <20240425101845.708554-1-rhi@pengutronix.de> (Roland Hieber's message of "Thu, 25 Apr 2024 12:18:42 +0200")
Roland Hieber <rhi@pengutronix.de> writes:
> Even 'symbolic-ref' is only completed when
> GIT_COMPLETION_SHOW_ALL_COMMANDS=1 is set, it currently defaults to
> completing file names, which is not very helpful. Add a simple
> completion function which completes options and refs.
>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> PATCH v3:
> - make use of __gitcomp_builtin instead of hard-coded options, and add
> a test for it (thanks to Patrick Steinhardt)
Nice.
> - add empty line between test cases (thanks to Patrick Steinhardt)
>
> PATCH v2: https://lore.kernel.org/git/20240424215019.268208-1-rhi@pengutronix.de
> - no changes
>
> PATCH v1: https://lore.kernel.org/git/20240424210549.256256-1-rhi@pengutronix.de/
> ---
> contrib/completion/git-completion.bash | 11 +++++++++++
> t/t9902-completion.sh | 23 +++++++++++++++++++++++
> 2 files changed, 34 insertions(+)
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 75193ded4bde..4d63fb6eeaf7 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -3581,6 +3581,17 @@ _git_svn ()
> fi
> }
>
> +_git_symbolic_ref () {
> + case "$cur" in
> + --*)
> + __gitcomp_builtin symbolic-ref
> + return
> + ;;
> + esac
> +
> + __git_complete_refs
> +}
> +
> _git_tag ()
> {
> local i c="$__git_cmd_idx" f=0
> diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
> index 569cf2310434..963f865f27ed 100755
> --- a/t/t9902-completion.sh
> +++ b/t/t9902-completion.sh
> @@ -2518,6 +2518,29 @@ test_expect_success 'complete tree filename with metacharacters' '
> EOF
> '
>
> +test_expect_success 'symbolic-ref completes builtin options' '
> + test_completion "git symbolic-ref --d" <<-\EOF
> + --delete Z
> + EOF
> +'
> +
> +test_expect_success 'symbolic-ref completes short ref names' '
> + test_completion "git symbolic-ref foo m" <<-\EOF
> + main Z
> + mybranch Z
> + mytag Z
> + EOF
> +'
> +
> +test_expect_success 'symbolic-ref completes full ref names' '
> + test_completion "git symbolic-ref foo refs/" <<-\EOF
> + refs/heads/main Z
> + refs/heads/mybranch Z
> + refs/tags/mytag Z
> + refs/tags/A Z
> + EOF
> +'
> +
> test_expect_success PERL 'send-email' '
> test_completion "git send-email --cov" <<-\EOF &&
> --cover-from-description=Z
next prev parent reply other threads:[~2024-04-25 16:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-25 10:18 [PATCH v3 1/3] completion: add 'symbolic-ref' Roland Hieber
2024-04-25 10:18 ` [PATCH v3 2/3] completion: improve docs for using __git_complete Roland Hieber
2024-04-25 10:18 ` [PATCH v3 3/3] completion: add docs on how to add subcommand completions Roland Hieber
2024-04-25 10:45 ` [PATCH v3 1/3] completion: add 'symbolic-ref' Kristoffer Haugsbakk
2024-04-25 14:36 ` Justin Tobler
2024-04-25 16:42 ` Junio C Hamano
2024-04-25 21:40 ` Justin Tobler
2024-04-25 21:48 ` Junio C Hamano
2024-04-25 16:50 ` Junio C Hamano [this message]
2024-04-26 11:43 ` Patrick Steinhardt
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=xmqqcyqdgze3.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.com \
--cc=rhi@pengutronix.de \
/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.
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 read-only IMAP folder(s) and NNTP newsgroup(s).