From: Junio C Hamano Date: Wed, 26 Aug 2026 22:04:43 GMT Subject: Re: [PATCH v2] completion: zsh: support completion after "git -C " Message-ID: In-Reply-To: "Lutz Lengemann via GitGitGadget" writes: > From: Lutz Lengemann > > The zsh completion wrapper does not handle the global -C option, so > > git -C > > offers nothing. -C is not part of the _arguments specification, and the > wrapper hard-codes __git_cmd_idx=1, i.e. it assumes that the command is > the first argument, so the bash helpers look at the wrong word. The > latter is not specific to -C; the assumption breaks after any global > option, e.g. "git -p checkout " does not complete branch names. > > Add -C to the specification, and find the command by skipping over the > global options and, where they take one, their arguments, as __git_main > in git-completion.bash does. The index is one less than zsh's, as the > helpers count the words from zero. Collect the paths given to -C into > __git_C_args, or else the helpers run git in the current directory and > fail to resolve the aliases and refs of the repository the command runs > in. > > The argument of a -C is still completed without regard for the -C > options before it, i.e. "git -C dir -C " offers the directories in > ".", not the ones in "dir". > > Signed-off-by: Lutz Lengemann > --- Let me mark the topic for 'next', as later parts of the thread was about an unrelated tangent.