completion: bash: fix for suboptions with value
We need to ignore options that don't start with -- as well. Depending on the value of COMP_WORDBREAKS the last word could be duplicated otherwise. Can be tested with: git merge -X diff-algorithm=<tab> Tested-by: David Aguilar <davvid@gmail.com> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
Aug 16, 2021 at 04:10 UTC
e9f2118ddfad4ae5e37adc7637acc9daf4ac8c9c
2 files changed
+16
-1
contrib/completion/git-completion.bash
+1
-1
@@ -356,7 +356,7 @@ __gitcomp ()
356
local cur_="${3-$cur}"
357
358
case "$cur_" in
359
- --*=)
359
+ *=)
360
;;
361
--no-*)
362
local c i=0 IFS=$' \t\n'
t/t9902-completion.sh
+15
@@ -540,6 +540,15 @@ test_expect_success '__gitcomp - expand/narrow all negative options' '
540
EOF
541
'
542
543
+test_expect_success '__gitcomp - equal skip' '
544
+ test_gitcomp "--option=" "--option=" <<-\EOF &&
545
+
546
+ EOF
547
+ test_gitcomp "option=" "option=" <<-\EOF
548
+
549
+ EOF
550
+'
551
+
552
test_expect_success '__gitcomp - doesnt fail because of invalid variable name' '
553
__gitcomp "$invalid_variable_name"
554
'
@@ -2380,6 +2389,12 @@ test_expect_success 'git clone --config= - value' '
2389
EOF
2390
'
2391
2392
+test_expect_success 'options with value' '
2393
+ test_completion "git merge -X diff-algorithm=" <<-\EOF
2394
+
2395
+ EOF
2396
+'
2397
+
2398
test_expect_success 'sourcing the completion script clears cached commands' '
2399
__git_compute_all_commands &&
2400
verbose test -n "$__git_all_commands" &&