Denton Liu <liu.denton@xxxxxxxxx> writes: > Good observation. _git_stash() is called in the body of > __git_complete_command() which is called by __git_main(). There is > currently no mechanism by which to pass the index of the command over to > _git_*() completion functions. I think, given that "set | grep _git" tells us we use many globals already, it would be OK to introduce another variable, call it $__git_subcmd_pos, and assign to it when the command dispatcher discovers which token on the command line is the subcommand name and decides to call the subcommand specific completion helper function. Or does the command dispatcher not exactly know the position (e.g. iterates with "for w" and knows $w==stash in the current iteration but it is not counting the position in the array)? If so, then we'd need a surgery larger than that. But if we only need to set a variable, we won't have to change the calling convention of these helpers (well, we shouldn't be changing the arguments to completion functions lightly anyway---third-party completion functions can be called from __git_complete_command, if I am reading the code correctly, and we cannot update them all even if we wanted to). And most subcommands that do not care where on the command line the subcommand name is won't have to change anything. > That being said, passing in the index to all functions would definitely > be doable. I can work on a series in the future that passes in the index > of the command so that working with $cword is more robust but I'd prefer > if that were handled outside this series to keep it focused. If the breakage of "stash branch" were a serious show-stopper bug that needs to be fixed right away, I would agree that a band-aid solution that would work most of the time would be fine, but I didn't get an impression that it is so urgent and we can afford to fix it right this time, together with the other completion that share the same problem (you mentioned _git_worktree IIRC). Thanks.
