Re: Bug: git completion: __git_ignore_line ignores complete branch

[Mikael Magnusson <mikachu@xxxxxxxxx>]

On Sun, Aug 2, 2015 at 4:44 PM, Daniel Hahler
<genml+zsh-workers@xxxxxxxxxx> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> __git_ignore_line_inside_arguments seems to be responsible for an error when trying
> to complete an already complete branch.
>
> E.g. "git branch -D branch<tab>" results in:
>  -- no matches found: `branch-name' --
>
> But "git branch -D branc<tab>" will complete "branch".
>
> This is the function:
>
> (( $+functions[__git_ignore_line] )) ||
> __git_ignore_line () {
>   declare -a ignored
>   ignored=()
>   ((CURRENT > 1)) &&
>     ignored+=(${line[1,CURRENT-1]//(#m)[\[\]()\\*?#<>~\^]/\\$MATCH})
>   ((CURRENT < $#line)) &&
>     ignored+=(${line[CURRENT+1,-1]//(#m)[\[\]()\\*?#<>~\^]/\\$MATCH})
>   $* -F ignored
> }
>
> (( $+functions[__git_ignore_line_inside_arguments] )) ||
> __git_ignore_line_inside_arguments () {
>   declare -a compadd_opts
>
>   zparseopts -D -E -a compadd_opts V: J: 1 2 n f X: M: P: S: r: R: q F:
>
>   __git_ignore_line $* $compadd_opts
> }
>
> And it is used like this in _git-branch:
>
>   dependent_deletion_args+='*: :__git_ignore_line_inside_arguments __git_branch_names'
>
> The problem is that it will ignore the current word, "branch", but should do so probably
> only if it is not being completed currently, i.e. has a space at the end?!
>
> It works when completing "branc", because then only "branc" will be ignored.
>
> $line in the context of __git_ignore_line will be the part after "git branch -D", and $CURRENT will be 3.  That seems to be off?!
>
> For the case at hand, using ${line[1,CURRENT-3]//...} seems to fix it, but probably
> an index matching the position in $line, and then -1 should be used?!

I haven't looked at the code but this sounds like huge confusion in
the code. The ignore-line style already does this generically for
anything you can complete, _git shouldn't be doing it manually in a
single specific case at all.

-- 
Mikael Magnusson