Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: git worktree add /foo <TAB>

Oliver Kiddle wrote on Mon, Aug 14, 2017 at 13:57:33 +0200:
> On 9 Aug, Daniel Shahaf wrote:
> > The second argument to 'git worktree add' can be any committish.  That
> > committish becomes HEAD of the new worktree, and if it's a branch name,
> > then that branch becomes the current branch of the new worktree, else
> > the new worktree starts as a detached HEAD.
> >
> > How should that be completed?
> >
> > Currently it's completed as follows:
> >
> > +++ b/Completion/Unix/Command/_git
> > @@ -2026,11 +2026,7 @@ _git-worktree() {
> >        curcontext=${curcontext%:*}-$line[1]:
> >        case $line[1] in
> >          (add)
> >  	  if (( $words[(I)--detach] )); then
> >  	    args=( ':commit:__git_commits' )
> >  	  else
> >  	    args=( ':branch:__git_branch_names' )
> >  	  fi
> I can't remember why it was done this way but I'm wondering if the
> two halves of the if…else…fi are the opposite way around from the
> intention. Specifying --detach would be superfluous for anything but
> a branch because it is the default for any other committish so after
> --detach there is sense in only completing branches.


> I often apply logic such as this but it might not always be helpful,
> such as if --detach comes from an alias.

I don't understand.  Firstly, both zsh aliases and git aliases are
'seen through' in completion; secondly, the perfect shouldn't be the
enemy of the good.

> Otherwise, as you say, any committish is valid and our usual approach
> is to just complete them all and expect user's to set tag-order to give
> preference to the matches they find most useful. I suggested years back
> that we perhaps add a mechanism for giving a default tag-order and
> perhaps should consider it again.

Let's collect a few such settings before we invent a mechanism; it's
easier to invent when there are concrete details to work with.

To start with, here's one style I use:

    # Prefer recent commit object name completion
    zstyle ':completion::complete:git-(format-patch|send-email):argument-1:' group-order commits

> > I see __git_recent_branches but it's not precisely what I have in mind.
> What would be useful in this case?

Just __git_branch_names — namely, names of local branches — is exactly
what I was after.  (Don't know how I managed to miss it)

So, yes, reversing the if and adding a tag-order/group-order style
should suffice.

Additionally, it would be nice if the group description said
"(alternatively specify name of new branch)" like _mkdir does.



Messages sorted by: Reverse Date, Date, Thread, Author