[RFC PATCH 5/6] completion: recognize but do not complete 'view'
- From
Britton Leo Kerin <britton.kerin@gmail.com>
- Date
- Jan 2, 2024, 19:57 UTC
- Message-ID
- <cda06ddc-3de6-4fef-a6e2-a3da8c0bac25@smtp-relay.sendinblue.com>
- In-Reply-To
- <20240102195744.478503-1-britton.kerin@gmail.com>
Completing it might annoy some existing users by creating completion ambiguity on 'v' and 'vi' without adding anything useful in terms of interface discovery/recall (because 'view' is just an alias anyway).
Signed-off-by: Britton Leo Kerin <britton.kerin@gmail.com> --- contrib/completion/git-completion.bash | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index a09598c5c1..3bb790220a 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1589,13 +1589,16 @@ _git_bisect () term_good=`__git bisect terms --term-good` fi - local subcommands="start bad new $term_bad good old $term_good terms skip reset visualize replay log run help" + # We want to recognize 'view' but not complete it, because it overlaps + # with 'visualize' too much and is just an alias for it. + local completable_subcommands="start bad new $term_bad good old $term_good terms skip reset visualize replay log run help" + local all_subcommands="$completable_subcommands view" - local subcommand="$(__git_find_on_cmdline "$subcommands")" + local subcommand="$(__git_find_on_cmdline "$all_subcommands")" if [ -z "$subcommand" ]; then if [ -f "$__git_repo_path"/BISECT_START ]; then - __gitcomp "$subcommands" + __gitcomp "$completable_subcommands" else __gitcomp "replay start" fi @@ -1613,7 +1616,7 @@ _git_bisect () ;; esac ;; - visualize) + visualize|view) case "$cur" in -*) __git_complete_log_opts
-- 2.43.0