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

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

completion: bash: support recursive aliases

2020-11-10T02:09:21Z

It is possible to have recursive aliases like: l = log --oneline lg = l --graph So the completion should detect such aliases as well. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

Merge branch 'fc/zsh-completion'

2020-11-09T22:06:29Z

Zsh autocompletion (in contrib/) update. * fc/zsh-completion: (29 commits) zsh: update copyright notices completion: bash: remove old compat wrappers completion: bash: cleanup cygwin check completion: bash: trivial cleanup completion: zsh: add simple version check completion: zsh: trivial simplification completion: zsh: add alias descriptions completion: zsh: improve command tags completion: zsh: refactor command completion completion: zsh: shuffle functions around completion: zsh: simplify file_direct completion: zsh: simplify nl_append completion: zsh: trivial cleanup completion: zsh: simplify direct compadd completion: zsh: simplify compadd functions completion: zsh: fix splitting of words completion: zsh: add missing direct_append completion: fix conflict with bashcomp completion: zsh: fix completion for --no-.. options completion: bash: remove zsh wrapper ...

Merge branch 'dl/diff-merge-base'

2020-11-02T21:17:39Z

"git diff A...B" learned "git diff --merge-base A B", which is a longer short-hand to say the same thing. * dl/diff-merge-base: contrib/completion: complete `git diff --merge-base` builtin/diff-tree: learn --merge-base builtin/diff-index: learn --merge-base t4068: add --merge-base tests diff-lib: define diff_get_merge_base() diff-lib: accept option flags in run_diff_index() contrib/completion: extract common diff/difftool options git-diff.txt: backtick quote command text git-diff-index.txt: make --cached description a proper sentence t4068: remove unnecessary >tmp

completion: bash: remove old compat wrappers

2020-10-28T21:30:59Z

It's been eight years, more than enough time to move on. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

completion: bash: cleanup cygwin check

2020-10-28T21:30:59Z

Avoid Yoda conditions, and use $OSTYPE. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

completion: bash: trivial cleanup

2020-10-28T21:30:59Z

There's no need to set a variable we are not going to use. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano