From: Roland Hieber <rhi@pengutronix.de>
To: Patrick Steinhardt <ps@pks.im>
Cc: git@vger.kernel.org, Denton Liu <liu.denton@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2 1/2] completion: add 'symbolic-ref'
Date: Thu, 25 Apr 2024 12:21:16 +0200 [thread overview]
Message-ID: <20240425102116.fgis3qqhi7y5uh3q@pengutronix.de> (raw)
In-Reply-To: <Zin1nOSfckSt-H0J@tanuki>
On Thu, Apr 25, 2024 at 08:18:04AM +0200, Patrick Steinhardt wrote:
> On Wed, Apr 24, 2024 at 11:50:17PM +0200, Roland Hieber wrote:
> > 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 v2:
> > - 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 | 16 ++++++++++++++++
> > 2 files changed, 27 insertions(+)
> >
> > diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> > index 75193ded4bde..ffcc55484bcd 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 "--delete --quiet --short --recurse --no-recurse"
> > + return
> > + ;;
>
> Instead of hardcoding these we may use the `--git-completion-helper`
> option, which outputs the options for us. We have `__gitcomp_builtin ()`
> to do this.
Ahh thanks, I didn't know there was automagic for it! Fixed in v3:
<https://lore.kernel.org/git/20240425101845.708554-1-rhi@pengutronix.de/>
- Roland
> > + 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..a34953da6c96 100755
> > --- a/t/t9902-completion.sh
> > +++ b/t/t9902-completion.sh
> > @@ -2518,6 +2518,22 @@ test_expect_success 'complete tree filename with metacharacters' '
> > 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
> > +'
>
> Nit: let's add a newline between those two test cases.
>
> Patrick
>
> > +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
> > --
> > 2.39.2
> >
> >
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
prev parent reply other threads:[~2024-04-25 10:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-24 21:50 [PATCH v2 1/2] completion: add 'symbolic-ref' Roland Hieber
2024-04-24 21:50 ` [PATCH v2 2/2] completion: add docs on how to add subcommand completions Roland Hieber
2024-04-25 6:18 ` [PATCH v2 1/2] completion: add 'symbolic-ref' Patrick Steinhardt
2024-04-25 10:21 ` Roland Hieber [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240425102116.fgis3qqhi7y5uh3q@pengutronix.de \
--to=rhi@pengutronix.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=liu.denton@gmail.com \
--cc=ps@pks.im \
/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://80x24.org/mirrors/git.git
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).