git/contrib/completion/git-completion.bash, branch v2.31.2

Merge branch 'jk/complete-branch-force-delete'

2021-02-12T22:21:04Z

The command line completion (in contrib/) completed "git branch -d" with branch names, but "git branch -D" offered tagnames in addition, which has been corrected. "git branch -M" had the same problem. * jk/complete-branch-force-delete: doc/git-branch: fix awkward wording for "-c" completion: handle other variants of "branch -m" completion: treat "branch -D" the same way as "branch -d"

completion: handle other variants of "branch -m"

2021-02-03T22:14:24Z

We didn't special-case "branch -M" (with a capital M) the same as "branch -m", nor any of the "--copy" variants. As a result these offered any ref as the next candidate, and not just branch names. Note that I rewrapped case-arm line since it's now quite long, and likewise the one below it for consistency. I also re-ordered the existing "-D" to make it more obvious how the cases group together. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

completion: treat "branch -D" the same way as "branch -d"

2021-02-02T21:26:10Z

The former offers not just branches but tags as completion candidates. Mimic how "branch -d" limits its suggestion to branch names. Reported-by: Paul Jolly Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

completion: add proper public __git_complete

2021-01-04T23:25:56Z

When __git_complete was introduced, it was meant to be temporarily, while a proper guideline for public shell functions was established (tentatively _GIT_complete), but since that never happened, people in the wild started to use __git_complete, even though it was marked as not public. Eight years is more than enough wait, let's mark this function as public, and make it a bit more user-friendly. So that instead of doing: __git_complete gk __gitk_main The user can do: __git_complete gk gitk And instead of: __git_complete gf _git_fetch Do: __git_complete gf git_fetch Backwards compatibility is maintained. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

completion: bash: improve function detection

2021-01-04T23:25:56Z

1. We should quote the argument 2. We don't need two redirections 3. A safeguard for arguments (-a) would be good Suggested-by: René Scharfe Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

completion: bash: add __git_have_func helper

2021-01-04T23:25:56Z

This makes the code more readable, and also will help when new code wants to do similar checks. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

Merge branch 'fc/zsh-completion'

2020-12-08T23:11:22Z

Hotfix for a recent breakage. * fc/zsh-completion: completion: bash: fix gitk alias regression completion: zsh: fix file completion regression

completion: bash: fix gitk alias regression

2020-12-07T21:39:53Z

Long time ago when the _git_complete helper was introduced, _gitk was replaced with __gitk_main, and a placeholder for backwards compatibility pointing to __git_wrap_main_gitk was left in place. When "__git_complete gitk __gitk_main" was called, that created the __git_wrap__gitk_main helper, which is just basically "__git_func_wrap __gitk_main" plus `complete` options. Unfortunately the commit b0a4b2d257 (completion: add support for backwards compatibility, 2012-05-19) missed a previous instance of a call to _gitk in _git_gitk So, basically we had __git_wrap__git_main -> __git_func_wrap __git_main -> __git_complete_command gitk -> _git_gitk -> _gitk -> __git_wrap__gitk_main -> __git_func_wrap __gitk_main -> __gitk_main. There was never any need to call __git_func_wrap twice. Since _git_gitk is always called inside the wrapper, it can call __gitk_main directly. And then, in commit 441ecdab37 (completion: bash: remove old compat wrappers, 2020-10-27) _gitk was removed, which triggers the following error: _git_gitk:9: command not found: _gitk Let's call the correct function: __gitk_main. Cc: SZEDER Gábor Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

completion: bash: improve alias loop detection

2020-11-17T18:57:46Z

It is possible for the name of an alias to end with the name of another alias, in which case the code will incorrectly detect a loop. We can fix that by adding an extra space between words. Suggested-by: SZEDER Gábor Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

completion: bash: check for alias loop

2020-11-10T02:09:21Z

We don't want to be stuck in an endless cycle. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano