[PATCH 3/4] completion: disable dwim on "git switch -d"
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Jun 20, 2019, 09:55 UTC
- Message-ID
- <20190620095523.10003-4-pclouds@gmail.com>
- In-Reply-To
- <20190620095523.10003-1-pclouds@gmail.com>
Even though dwim is enabled by default, it will never be done when --detached is specified. If you force "-d --guess" you will get an error because --guess then implies -c which cannot be used with -d. So we can disable dwim in "switch -d". It makes the completion list in this case a bit shorter.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- contrib/completion/git-completion.bash | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 58d18d41a2..656e49710e 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2183,6 +2183,10 @@ _git_switch () fi if [ -z "$(__git_find_on_cmdline "-d --detach")" ]; then only_local_ref=y + else + # --guess --detach is invalid combination, no + # dwim will be done when --detach is specified + track_opt= fi if [ $only_local_ref = y -a -z "$track_opt" ]; then __gitcomp_direct "$(__git_heads "" "$cur" " ")"
-- 2.22.0.rc0.322.g2b0371e29a