Felipe Contreras wrote: > --- a/contrib/completion/git-completion.bash > +++ b/contrib/completion/git-completion.bash > @@ -3511,7 +3511,7 @@ fi > > __git_func_wrap () > { > - local cur words cword prev > + local cur words cword prev __git_cmd_idx=1 I just realized this isn't 100% correct thanks to Fabian Wermelinger. If we use __git_complete then the index should be 0. The above fixes the annoying errors, but some commands don't complete correctly (e.g. git_fetch). I've sent an updated fix [1]. [1] https://lore.kernel.org/git/20210618185832.700477-1-felipe.contreras@xxxxxxxxx/ -- Felipe Contreras