git/contrib, branch v2.30.2

Merge branch 'js/cmake-extra-built-ins-fix'

2020-12-14T18:21:38Z

VSbuild fix. * js/cmake-extra-built-ins-fix: cmake: determine list of extra built-ins dynamically

Merge branch 'da/vs-build-iconv-fix'

2020-12-14T18:21:38Z

Build update. * da/vs-build-iconv-fix: ci(vs-build): stop passing the iconv library location explicitly

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

cmake: determine list of extra built-ins dynamically

2020-12-04T20:11:07Z

In 0a21d0e08902 (Makefile: mark git-maintenance as a builtin, 2020-12-01), we marked git-maintenance as a builtin in the Makefile, but forgot to do the same in `CMakeLists.txt`. Rather than always play catch-up and adjust `git_builtin_extra` manually, use the `BUILT_INS` definitions in the Makefile as authoritative source and generate `git_builtin_extra` dynamically. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

ci(vs-build): stop passing the iconv library location explicitly

2020-12-04T20:03:15Z

Something changed in `vcpkg` (which we use in our Visual C++ build to provide the dependencies such as libcurl) and our `vs-build` job started failing in CI. The reason is that we had a work-around in place to help CMake find iconv, and this work-around is neither needed nor does it work anymore. For the full discussion with the vcpkg project, see this comment: https://github.com/microsoft/vcpkg/issues/14780#issuecomment-735368280 Signed-off-by: Dennis Ameling Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

completion: zsh: fix file completion regression

2020-12-01T18:32:40Z

Turns out we always need to set the ignored prefix (compset) to have similar behavior as in default Bash. The issue can be seen with: git show master: Commit 94b2901cfe wrongly removed it. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

Merge branch 'fc/bash-completion-alias-of-alias'

2020-11-25T23:24:51Z

The command line completion script (in contrib/) learned to expand commands that are alias of alias. * fc/bash-completion-alias-of-alias: completion: bash: improve alias loop detection completion: bash: check for alias loop completion: bash: support recursive aliases

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

Merge branch 'sd/prompt-local-variable'

2020-11-11T21:18:38Z

Code clean-up. * sd/prompt-local-variable: git-prompt.sh: localize `option` in __git_ps1_show_upstream