git/contrib/completion, branch v2.42.2

Merge branch 'pb/completion-aliases-doc' into maint-2.42

2023-11-02T07:53:19Z

Clarify how "alias.foo = : git cmd ; aliased-command-string" should be spelled with necessary whitespaces around punctuation marks to work. * pb/completion-aliases-doc: completion: improve doc for complex aliases

Merge branch 'js/complete-checkout-t' into maint-2.42

2023-11-02T07:53:18Z

The completion script (in contrib/) has been taught to treat the "-t" option to "git checkout" and "git switch" just like the "--track" option, to complete remote-tracking branches. * js/complete-checkout-t: completion(switch/checkout): treat --track and -t the same

completion: improve doc for complex aliases

2023-09-13T00:46:01Z

The completion code can be told to use a particular completion for aliases that shell out by using ': git ;' as the first command of the alias. This only works if and the semicolon are separated by a space, since if the space is missing __git_aliased_command returns (for example) 'checkout;' instead of just 'checkout', and then __git_complete_command fails to find a completion for 'checkout;'. The examples have that space but it's not clear if it's just for style or if it's mandatory. Explicitly mention it. Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano

completion(switch/checkout): treat --track and -t the same

2023-09-08T16:26:15Z

When `git switch --track ` is to be completed, only remote refs are eligible because that is what the `--track` option targets. And when the short-hand `-t` is used instead, the same _should_ happen. Let's make it so. Note that the bug exists both in the completions of `switch` and `completion`, even if it manifests in slightly different ways: While the completion of `git switch -t ` will not even look at remote refs, the completion of `git checkout -t ` will look at both remote _and_ local refs. Both should look only at remote refs. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'pb/complete-diff-options'

2023-07-06T18:54:46Z

Completion updates. * pb/complete-diff-options: (24 commits) diff.c: mention completion above add_diff_options completion: complete --remerge-diff completion: complete --diff-merges, its options and --no-diff-merges completion: move --pickaxe-{all,regex} to __git_diff_common_options completion: complete --ws-error-highlight completion: complete --unified completion: complete --output-indicator-{context,new,old} completion: complete --output completion: complete --no-stat completion: complete --no-relative completion: complete --line-prefix completion: complete --ita-invisible-in-index and --ita-visible-in-index completion: complete --irreversible-delete completion: complete --ignore-matching-lines completion: complete --function-context completion: complete --find-renames completion: complete --find-object completion: complete --find-copies completion: complete --default-prefix completion: complete --compact-summary ...

completion: complete --remerge-diff

2023-06-26T16:40:14Z

--remerge-diff only makes sense for 'git log' and 'git show', so add it to __git_log_show_options which is referenced in the completion for these two commands. Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano

completion: complete --diff-merges, its options and --no-diff-merges

2023-06-26T16:40:14Z

The flags --[no-]diff-merges only make sense for 'git log' and 'git show', so add a new variable __git_log_show_options for options only relevant to these two commands, and add them there. Also add __git_diff_merges_opts and list the accepted values for --diff-merges, and use it in _git_log and _git_show. Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano

completion: move --pickaxe-{all,regex} to __git_diff_common_options

2023-06-26T16:40:13Z

The options --pickaxe-all and --pickaxe-regex are listed in __git_diff_difftool_options and repeated in _git_log. Move them to __git_diff_common_options instead, which makes them available automatically in the completion of other commands referencing this variable. Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano

completion: complete --ws-error-highlight

2023-06-26T16:40:13Z

Add --ws-error-highlight= to the list in __git_diff_common_options, and add the accepted values in a new list __git_ws_error_highlight_opts. Use __git_ws_error_highlight_opts in _git_diff, _git_log and _git_show to offer the accepted values. As noted in fd0bc17557 (completion: add diff --color-moved[-ws], 2020-02-21), there is no easy way to offer completion for several comma-separated values, so this is limited to completing a single value. Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano

completion: complete --unified

2023-06-26T16:40:13Z

Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano