git/contrib/completion, branch v2.45.2

Merge branch 'vs/complete-with-set-u-fix'

2024-04-10T17:00:08Z

Another "set -u" fix for the bash prompt (in contrib/) script. * vs/complete-with-set-u-fix: completion: protect prompt against unset SHOWUPSTREAM in nounset mode completion: fix prompt with unset SHOWCONFLICTSTATE in nounset mode

completion: protect prompt against unset SHOWUPSTREAM in nounset mode

2024-04-01T19:38:23Z

As it stands, the only call site of `__git_ps1_show_upstream` checks that the `GIT_PS1_SHOWUPSTREAM` variable is set, so this is effectively a no-op. However, that might change, and chances of noticing the unprotected use might not be that high when it does. Signed-off-by: Ville Skyttä Signed-off-by: Junio C Hamano

completion: fix prompt with unset SHOWCONFLICTSTATE in nounset mode

2024-04-01T15:31:54Z

`GIT_PS1_SHOWCONFLICTSTATE` is a user variable that might not be set, causing errors when the shell is in `nounset` mode. Take into account on access by falling back to an empty string. Signed-off-by: Ville Skyttä Signed-off-by: Junio C Hamano

Merge branch 'rj/complete-worktree-paths-fix'

2024-03-14T21:05:25Z

The logic to complete the command line arguments to "git worktree" subcommand (in contrib/) has been updated to correctly honor things like "git -C dir" etc. * rj/complete-worktree-paths-fix: completion: fix __git_complete_worktree_paths

Merge branch 'rj/complete-reflog'

2024-03-14T21:05:24Z

The command line completion script (in contrib/) learned to complete "git reflog" better. * rj/complete-reflog: completion: reflog subcommands and options completion: factor out __git_resolve_builtins completion: introduce __git_find_subcommand completion: reflog show completion: reflog with implicit "show"

completion: reflog subcommands and options

2024-03-03T22:21:39Z

Make generic the completion for reflog subcommands and its options. Note that we still need to special case the options for "show". Signed-off-by: Rubén Justo Signed-off-by: Junio C Hamano

completion: factor out __git_resolve_builtins

2024-03-03T22:21:39Z

We're going to use the result of "git xxx --git-completion-helper" not only for feeding COMPREPLY. Therefore, factor out the execution and the caching of its results in __gitcomp_builtin, to a new function __git_resolve_builtins. While we're here, move an important comment we have in the function to its header, so it gains visibility. Signed-off-by: Rubén Justo Signed-off-by: Junio C Hamano

completion: introduce __git_find_subcommand

2024-03-03T22:21:38Z

Let's have a function to get the current subcommand when completing commands that follow the syntax: git As a convenience, let's allow an optional "default subcommand" to be returned if none is found. Signed-off-by: Rubén Justo Signed-off-by: Junio C Hamano

completion: reflog show

2024-03-03T22:21:38Z

Let's add completion for in "reflog show" so that the user can easily discover uses like: $ git reflog --since=1.day.ago Signed-off-by: Rubén Justo Signed-off-by: Junio C Hamano

completion: reflog with implicit "show"

2024-03-03T22:21:38Z

When no subcommand is specified to "reflog", we assume "show" [1]: $ git reflog -h usage: git reflog [show] [] [] ... This implicit "show" is not being completed correctly: $ git checkout -b default $ git reflog def ... no completion options ... The expected result is: $ git reflog default This happens because we're completing references after seeing a valid subcommand in the command line. This prevents the implicit "show" from working properly, but also introduces a new problem: it keeps offering subcommand options when the subcommand is implicit: $ git checkout -b explore $ git reflog default ex ... $ git reflog default expire The expected result is: $ git reflog default explore To fix this, complete references even if no subcommand is present, or in other words when the subcommand is implicit "show". Also, only include completion options for subcommands when completing the right position in the command line. 1. cf39f54efc (git reflog show, 2007-02-08) Signed-off-by: Rubén Justo Signed-off-by: Junio C Hamano