Completion works when used as "git checkout foo" but fails with "bash: [: 1: unary operator expected" when trying to complete via a single character shell alias like "alias g=git" as in "g checkout foo".
git version 1.7.10.2.548.g9de9681
Jeff KingRe: git-completion with bash alias
On Fri, May 18, 2012 at 01:35:24PM +0200, Carsten Mattner wrote:
Show 6 quoted lines
> Completion works when used as "git checkout foo" but fails with > "bash: [: 1: unary operator expected" when trying to complete > via a single character shell alias like "alias g=git" as in > "g checkout foo". > > git version 1.7.10.2.548.g9de9681
Hmm. Are you invoking the completion like:
complete -F _git g
? That used to work, but was broken by the recent 6b179ad (completion: add new __git_complete helper, 2012-05-14).
The "new" way seems to be:
__git_complete g _git
but that function is explicitly labeled as "not public". It looks like there was a follow-on patch that was discussed to make a public version, but it got dropped.
I'm not sure if this regression is intentional, or if the "old" way even worked reliably (I seem to recall people running into issues with _get_comp_words_by_ref not being called properly sometimes, but I don't remember the details). So it's not clear to me if the right way forward is fixing "complete -F _git" to work again, or if that way is just broken, and a public version of __git_complete is the right path.
Felipe, can you comment?
-Peff
Felipe ContrerasRe: git-completion with bash alias
On Sat, May 19, 2012 at 2:41 AM, Jeff King <peff@peff.net> wrote:
Show 12 quoted lines
> On Fri, May 18, 2012 at 01:35:24PM +0200, Carsten Mattner wrote: > >> Completion works when used as "git checkout foo" but fails with >> "bash: [: 1: unary operator expected" when trying to complete >> via a single character shell alias like "alias g=git" as in >> "g checkout foo". >> >> git version 1.7.10.2.548.g9de9681 > > Hmm. Are you invoking the completion like: > > complete -F _git g
s/_git/__git_wrap_git/
Show 10 quoted lines
> ? That used to work, but was broken by the recent 6b179ad (completion: > add new __git_complete helper, 2012-05-14). > > The "new" way seems to be: > > __git_complete g _git > > but that function is explicitly labeled as "not public". It looks like > there was a follow-on patch that was discussed to make a public version, > but it got dropped.
Well, _git was probably not public either.
Show 8 quoted lines
> I'm not sure if this regression is intentional, or if the "old" way even > worked reliably (I seem to recall people running into issues with > _get_comp_words_by_ref not being called properly sometimes, but I don't > remember the details). So it's not clear to me if the right way forward > is fixing "complete -F _git" to work again, or if that way is just > broken, and a public version of __git_complete is the right path. > > Felipe, can you comment?
The problem is with certain functions (e.g. _git_fetch), which are broken not only for aliases: try 'git --git-dir=$PWD fetch <tab>'.
Should be easy to provide backward compatibility though.
I'll send a patch soon.
-- Felipe Contreras
Re: git-completion with bash alias
On Sat, May 19, 2012 at 4:28 AM, Felipe Contreras <felipe.contreras@gmail.com> wrote:
Show 44 quoted lines
> On Sat, May 19, 2012 at 2:41 AM, Jeff King <peff@peff.net> wrote: >> On Fri, May 18, 2012 at 01:35:24PM +0200, Carsten Mattner wrote: >> >>> Completion works when used as "git checkout foo" but fails with >>> "bash: [: 1: unary operator expected" when trying to complete >>> via a single character shell alias like "alias g=git" as in >>> "g checkout foo". >>> >>> git version 1.7.10.2.548.g9de9681 >> >> Hmm. Are you invoking the completion like: >> >> complete -F _git g > > s/_git/__git_wrap_git/ > >> ? That used to work, but was broken by the recent 6b179ad (completion: >> add new __git_complete helper, 2012-05-14). >> >> The "new" way seems to be: >> >> __git_complete g _git >> >> but that function is explicitly labeled as "not public". It looks like >> there was a follow-on patch that was discussed to make a public version, >> but it got dropped. > > Well, _git was probably not public either. > >> I'm not sure if this regression is intentional, or if the "old" way even >> worked reliably (I seem to recall people running into issues with >> _get_comp_words_by_ref not being called properly sometimes, but I don't >> remember the details). So it's not clear to me if the right way forward >> is fixing "complete -F _git" to work again, or if that way is just >> broken, and a public version of __git_complete is the right path. >> >> Felipe, can you comment? > > The problem is with certain functions (e.g. _git_fetch), which are > broken not only for aliases: try 'git --git-dir=$PWD fetch <tab>'. > > Should be easy to provide backward compatibility though. > > I'll send a patch soon.
Any advice what I should put after alias g=git to enable completion for g? Temporarily using "__git_complete g _git".
Re: git-completion with bash alias
On Sat, May 19, 2012 at 2:41 AM, Jeff King <peff@peff.net> wrote:
Show 12 quoted lines
> On Fri, May 18, 2012 at 01:35:24PM +0200, Carsten Mattner wrote: > >> Completion works when used as "git checkout foo" but fails with >> "bash: [: 1: unary operator expected" when trying to complete >> via a single character shell alias like "alias g=git" as in >> "g checkout foo". >> >> git version 1.7.10.2.548.g9de9681 > > Hmm. Are you invoking the completion like: > > complete -F _git g
Is that supposed to be enough to get it working?
Show 6 quoted lines
> ? That used to work, but was broken by the recent 6b179ad (completion: > add new __git_complete helper, 2012-05-14). > > The "new" way seems to be: > > __git_complete g _git
Found that in 6b179adf in next and it worked. I used to have this complete -o bashdefault -o default -o nospace -F _git g \ 2>/dev/null || complete -o default -o nospace -F _git g
Show 14 quoted lines
> but that function is explicitly labeled as "not public". It looks like > there was a follow-on patch that was discussed to make a public version, > but it got dropped. > > I'm not sure if this regression is intentional, or if the "old" way even > worked reliably (I seem to recall people running into issues with > _get_comp_words_by_ref not being called properly sometimes, but I don't > remember the details). So it's not clear to me if the right way forward > is fixing "complete -F _git" to work again, or if that way is just > broken, and a public version of __git_complete is the right path. > > Felipe, can you comment? > > -Peff