diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-06-20 16:55:22 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-06-20 13:31:51 -0700 |
| commit | 97ed685701a6df0273f7d29fd5bc0a0658a63cad (patch) | |
| tree | 75b86aef84a29988f7311392a02124af3990908e /contrib/completion | |
| parent | switch: allow to switch in the middle of bisect (diff) | |
| download | tgif-97ed685701a6df0273f7d29fd5bc0a0658a63cad.tar.xz | |
completion: disable dwim on "git switch -d"
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/completion')
| -rw-r--r-- | contrib/completion/git-completion.bash | 4 |
1 files changed, 4 insertions, 0 deletions
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" " ")" |