aboutsummaryrefslogtreecommitdiffstats
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-04-16 19:28:09 +0900
committerJunio C Hamano <gitster@pobox.com>2019-04-16 19:28:09 +0900
commit2850232a21fa1c2548d4e4df9dbfb51e6423dcce (patch)
tree8bc7edc13b8db632e01fd86d066a98ef81b5fb56 /t
parentMerge branch 'ma/doc-diff-doc-vs-doctor-comparison' (diff)
parentcompletion: use __git when calling --list-cmds (diff)
downloadgit-2850232a21fa1c2548d4e4df9dbfb51e6423dcce.tar.gz
git-2850232a21fa1c2548d4e4df9dbfb51e6423dcce.zip
Merge branch 'tz/completion'
The completion helper code now pays attention to repository-local configuration (when available), which allows --list-cmds to honour a repository specific setting of completion.commands, for example. * tz/completion: completion: use __git when calling --list-cmds completion: fix multiple command removals t9902: test multiple removals via completion.commands git: read local config in --list-cmds
Diffstat (limited to 't')
-rwxr-xr-xt/t9902-completion.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index f5e21bf970..43cf313a1c 100755
--- 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 &&