From: Jacob Keller <jacob.keller@xxxxxxxxx> If a user wants to create a new branch using git switch, we should be able to complete any starting point reference. Additionally, DWIM logic will not work. Add -c and -C to the list of options for disabling --dwim and for choosing the --refs mode. This fixes several known breakages, so update these tests accordingly. Signed-off-by: Jacob Keller <jacob.keller@xxxxxxxxx> --- contrib/completion/git-completion.bash | 4 ++-- t/t9902-completion.sh | 18 +++++------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 0384b136763a..f9be0dabb03e 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2291,7 +2291,7 @@ _git_switch () # Certain combinations of options also disable this DWIM mode, # so we should not complete such names in these cases. - if [ -n "$(__git_find_on_cmdline "--track --no-track --no-guess -d --detach")" ]; then + if [ -n "$(__git_find_on_cmdline "--track --no-track --no-guess -d --detach -c -C")" ]; then dwim_opt='' fi @@ -2299,7 +2299,7 @@ _git_switch () # local branches, or DWIM with remote branch names. However, # certain options for creating branches or detaching should # complete all references. - if [ -n "$(__git_find_on_cmdline "-d --detach")" ]; then + if [ -n "$(__git_find_on_cmdline "-d --detach -c -C")" ]; then mode="refs" fi diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index cfd27e4857b7..68296d79a3e9 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -1284,11 +1284,7 @@ test_expect_success 'git switch - with --no-track, complete only local branch na EOF ' -# TODO: git switch completion does not yet support checking for -c, but it -# should be able to complete all possible references. Based on a quick -# examination of the switch/checkout code, -c will disable DWIM logic and thus -# we should not complete unique remote branch names with -c or -C either. -test_expect_failure 'git switch - with -c, complete all references' ' +test_expect_success 'git switch - with -c, complete all references' ' test_completion "git switch -c new-branch " <<-\EOF HEAD Z master Z @@ -1299,7 +1295,7 @@ test_expect_failure 'git switch - with -c, complete all references' ' EOF ' -test_expect_failure 'git switch - with -c, complete all references' ' +test_expect_success 'git switch - with -c, complete all references' ' test_completion "git switch -C new-branch " <<-\EOF HEAD Z master Z @@ -1310,8 +1306,7 @@ test_expect_failure 'git switch - with -c, complete all references' ' EOF ' -# TODO: ensure that the completion rules for -c override --track -test_expect_failure 'git switch - with -c and --track, complete all references' ' +test_expect_success 'git switch - with -c and --track, complete all references' ' test_completion "git switch -c new-branch --track " <<-EOF HEAD Z master Z @@ -1322,10 +1317,7 @@ test_expect_failure 'git switch - with -c and --track, complete all references' EOF ' -# TODO: git switch with -c and --no-track should allow creating a branch using -# any reference as a starting point. Because completion support does not -# recognize -c or -C, this doesn't work yet. -test_expect_failure 'git switch - with -c and --no-track, complete all references' ' +test_expect_success 'git switch - with -c and --no-track, complete all references' ' test_completion "git switch -c new-branch --no-track " <<-\EOF HEAD Z master Z @@ -1336,7 +1328,7 @@ test_expect_failure 'git switch - with -c and --no-track, complete all reference EOF ' -test_expect_failure 'git switch - with -C and --no-track, complete all references' ' +test_expect_success 'git switch - with -C and --no-track, complete all references' ' test_completion "git switch -C new-branch --no-track " <<-\EOF HEAD Z master Z -- 2.25.2
