Merge branch 'jc/make-dedup-ls-files-output'

diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index f5e21bf970f4dc44c7fa30d54134a15cf343ffc1..43cf313a1c09ad8fb223ba775d5548c3f00c339c 100755 (executable)
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -1484,6 +1484,12 @@ test_expect_success 'git --help completion' '
        test_completion "git --help core" "core-tutorial "
 '
 
+test_expect_success 'completion.commands removes multiple commands' '
+       test_config completion.commands "-cherry -mergetool" &&
+       git --list-cmds=list-mainporcelain,list-complete,config >out &&
+       ! grep -E "^(cherry|mergetool)$" out
+'
+
 test_expect_success 'setup for integration tests' '
        echo content >file1 &&
        echo more >file2 &&