fix: use -- to pass arbitrary cmdnames to _comp_load

scop · Apr 4, 2024 · 3c1d9bc · 3c1d9bc
1 parent 8795ca9
commit 3c1d9bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bash_completion b/bash_completion
@@ -3281,7 +3281,7 @@ _comp_xfunc()
     local xfunc_name=$2
     [[ $xfunc_name == _* ]] ||
         xfunc_name=_comp_xfunc_${1//[^a-zA-Z0-9_]/_}_$xfunc_name
-    declare -F "$xfunc_name" &>/dev/null || _comp_load "$1"
+    declare -F "$xfunc_name" &>/dev/null || _comp_load -- "$1"
     "$xfunc_name" "${@:3}"
 }
 

diff --git a/test/t/conftest.py b/test/t/conftest.py
@@ -381,7 +381,7 @@ def load_completion_for(bash: pexpect.spawn, cmd: str) -> bool:
     try:
         # Allow _comp_load to fail so we can test completions
         # that are directly loaded in bash_completion without a separate file.
-        assert_bash_exec(bash, "_comp_load %s || :" % cmd)
+        assert_bash_exec(bash, "_comp_load -- %s || :" % cmd)
         assert_bash_exec(bash, "complete -p %s &>/dev/null" % cmd)
     except AssertionError:
         return False