git/contrib/completion, branch v2.33.6

Merge branch 'ti/tcsh-completion-regression-fix' into maint

2021-10-12T20:51:24Z

Update to the command line completion (in contrib/) for tcsh. * ti/tcsh-completion-regression-fix: completion: tcsh: Fix regression by drop of wrapper functions

Merge branch 'fc/completion-updates' into maint

2021-10-12T20:51:24Z

Command line completion updates. * fc/completion-updates: completion: bash: add correct suffix in variables completion: bash: fix for multiple dash commands completion: bash: fix for suboptions with value completion: bash: fix prefix detection in branch.*

completion: tcsh: Fix regression by drop of wrapper functions

2021-08-18T20:58:27Z

The cleanup of old compat wrappers in bash completion caused a regression on tcsh completion that still uses them. Let's update the tcsh call site as well for addressing it. Fixes: 441ecdab37fe ("completion: bash: remove old compat wrappers") Signed-off-by: Takashi Iwai Signed-off-by: Junio C Hamano

completion: bash: add correct suffix in variables

2021-08-18T18:17:26Z

__gitcomp automatically adds a suffix, but __gitcomp_nl and others don't, we need to specify a space by default. Can be tested with: git config branch.autoSetupMe This fix only works for versions of bash greater than 4.0, before that "local sfx" creates an empty string, therefore the unset expansion doesn't work. The same happens in zsh. Therefore we don't add the test for that for now. The correct fix for all shells requires semantic changes in __gitcomp, but that can be done later. Cc: SZEDER Gábor Tested-by: David Aguilar Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

completion: bash: fix for multiple dash commands

2021-08-18T18:17:25Z

Otherwise options of commands like 'for-each-ref' are not completed. Tested-by: David Aguilar Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

completion: bash: fix for suboptions with value

2021-08-18T18:17:25Z

We need to ignore options that don't start with -- as well. Depending on the value of COMP_WORDBREAKS the last word could be duplicated otherwise. Can be tested with: git merge -X diff-algorithm= Tested-by: David Aguilar Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

completion: bash: fix prefix detection in branch.*

2021-08-18T18:17:25Z

Otherwise we are completely ignoring the --cur argument. The issue can be tested with: git clone --config=branch. Reviewed-by: SZEDER Gábor Tested-by: David Aguilar Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

Merge branch 'fw/complete-cmd-idx-fix'

2021-07-08T20:15:02Z

Recent update to completion script (in contrib/) broke those who use the __git_complete helper to define completion to their custom command. * fw/complete-cmd-idx-fix: completion: bash: fix late declaration of __git_cmd_idx

Merge branch 'tb/complete-diff-anchored'

2021-07-08T20:14:56Z

The command line completion (in contrib/) learned that "git diff" takes the "--anchored" option. * tb/complete-diff-anchored: completion: add --anchored to diff's options

completion: bash: fix late declaration of __git_cmd_idx

2021-06-19T06:30:35Z

A recent update to contrib/completion/git-completion.bash causes bash to fail auto complete custom commands that are wrapped with __git_func_wrap. Declaring __git_cmd_idx=0 inside __git_func_wrap resolves the issue. Signed-off-by: Fabian Wermelinger Signed-off-by: Junio C Hamano