[BUG]Filename autocompletion using git-bare repos (--git-dir=... --work-tree=...)

[BUG]Filename autocompletion using git-bare repos (--git-dir=... --work-tree=...)

[eliasghafari]

Hello,

I'm using a git bare repo to manage my files with this alias: "alias config='git --git-dir=$HOME/.local/share/dotfiles --work-tree=$HOME'",
completion for the commands works perfectly, e.g:
config ad<tab>
config add

config rm --ca<tab>
config rm --cached

But when it comes to filenames the autocompletion e.g:
in a normal git repo:
git rm --cached <tab> will show all the files that could be removed from
the index. And
git add <tab> will show all the files that were modified or created.

While using git bare repo:
config rm --cached <tab> doesn't show anything.
config add <tab> also shows nothing

So after investigating a bit, I found that the problem lied in the
expansion of the address of the git-dir and I found that by modifying
this line:
(( $+opt_args[--git-dir] )) && local -x GIT_DIR=${(Q)${~opt_args[--git-dir]}} && printf("\n${(Q)${~opt_args[--git-dir]}}\n")
which shows that the address passed to GIT_DIR is "$HOME/.local/share/dotfiles" without the "$HOME" being expanded to "/home/user".

I fixed this by replacing the Q modifier with e, but please note that I
have no idea how the zsh completion system works and I fixed this by
simply trying every modifier and seeing which one works.

After making that replacement,
config rm --cached <tab> shows what can be removed from the index, and
config add <tab> works too.

Re: [BUG]Filename autocompletion using git-bare repos (--git-dir=... --work-tree=...)

[Bart Schaefer]

On Thu, Mar 9, 2023 at 4:42 AM eliasghafari <eliasghafari@disroot.org> wrote:
>
> I'm using a git bare repo to manage my files with this alias: "alias config='git --git-dir=$HOME/.local/share/dotfiles --work-tree=$HOME'",
> [...]
> (( $+opt_args[--git-dir] )) && local -x GIT_DIR=${(Q)${~opt_args[--git-dir]}} && printf("\n${(Q)${~opt_args[--git-dir]}}\n")
> which shows that the address passed to GIT_DIR is "$HOME/.local/share/dotfiles" without the "$HOME" being expanded to "/home/user".
>
> I fixed this by replacing the Q modifier with e

The Q modifier is just cleaning up quotes, so you probably don't want
to remove that.  I think the right thing would be to change
${(Q)${~opt_args[--git-dir]}} to ${(Q)${(e)~opt_args[--git-dir]}} but
I would defer to Daniel or Oliver to confirm.

Re: [BUG]Filename autocompletion using git-bare repos (--git-dir=... --work-tree=...)

[Oliver Kiddle]

eliasghafari wrote:
> I'm using a git bare repo to manage my files with this alias: "alias config='git --git-dir=$HOME/.local/share/dotfiles --work-tree=$HOME'",

> While using git bare repo:
> config rm --cached <tab> doesn't show anything.

> So after investigating a bit, I found that the problem lied in the
> expansion of the address of the git-dir and I found that by modifying
> this line:
> (( $+opt_args[--git-dir] )) && local -x GIT_DIR=${(Q)${~opt_args[--git-dir]}} && printf("\n${(Q)${~opt_args[--git-dir]}}\n")
> which shows that the address passed to GIT_DIR is "$HOME/.local/share/dotfiles" without the "$HOME" being expanded to "/home/user".
>
> I fixed this by replacing the Q modifier with e, but please note that I

I would suggest you try using ~ instead of $HOME in your alias:

  alias config='git --git-dir=~/.local/share/dotfiles --work-tree=~'

The tilde in ${~opt_args[--git-dir]}} ensures that tildes are expanded.
While using (e) is arguably the right thing to do, it will expand things
like command-substitution and we've always intentionally shied away
from expanding anything that could have side-effects when parsing the
command-line for completion.

The modifiers don't allow you to pick-and-choose expansions so there
isn't a trivial way to expand variable references without expanding more
problematic things.

Oliver

The (e) parameter flag and side-effects

[Bart Schaefer]

On Thu, Mar 9, 2023 at 11:28 AM Oliver Kiddle <opk@zsh.org> wrote:
>
> While using (e) is arguably the right thing to do, it will expand things
> like command-substitution and we've always intentionally shied away
> from expanding anything that could have side-effects when parsing the
> command-line for completion.

We could add a flag for that, though, I think; it would just need to
do the same trick I applied to subscript values in named references,
that is, toggle the EXECOPT flag off and back on around (or in) the
call to subst_parse_str().

Re: [BUG]Filename autocompletion using git-bare repos (--git-dir=... --work-tree=...)

[Elias Ghafari]

On 23/03/09 08:27PM, Oliver Kiddle wrote:
> 
> I would suggest you try using ~ instead of $HOME in your alias:
> 
>   alias config='git --git-dir=~/.local/share/dotfiles --work-tree=~'
> 
> The tilde in ${~opt_args[--git-dir]}} ensures that tildes are expanded.

I have actually tried that before and i noticed that the completion
works as if i had put the (e), but the problem is, while the completion
works the command itself doesn't and returns an error saying that
'~/.local/share/dotfiles` isn't a git repo:
fatal: not a git repository: '~/.local/share/dotfiles'

Re: [BUG]Filename autocompletion using git-bare repos (--git-dir=... --work-tree=...)

[Roman Perepelitsa]

On Fri, Mar 10, 2023 at 11:08 AM Elias Ghafari <eliasghafari@disroot.org> wrote:
>
> On 23/03/09 08:27PM, Oliver Kiddle wrote:
> >
> > I would suggest you try using ~ instead of $HOME in your alias:
> >
> >   alias config='git --git-dir=~/.local/share/dotfiles --work-tree=~'
> >
> > The tilde in ${~opt_args[--git-dir]}} ensures that tildes are expanded.
>
> I have actually tried that before and i noticed that the completion
> works as if i had put the (e), but the problem is, while the completion
> works the command itself doesn't and returns an error saying that
> '~/.local/share/dotfiles` isn't a git repo:
> fatal: not a git repository: '~/.local/share/dotfiles'

You can either replace `--work-tree=~` with `--work-tree ~` or set
magic_equal_subst. I'd do the former.

Roman.