undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config: document and test the 'worktree' scope

Browse Source 
Test that "git config --show-scope" shows the "worktree" scope, and add
it to the list of scopes in Documentation/git-config.txt.

"git config --help" does not need to be updated because it already
mentions "worktree".

Signed-off-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Glen Choo 2022-06-07 21:24:04 +00:00 committed by Junio C Hamano
parent e54793a95a
commit db7961e6a6
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-config.txt
View File

@ -248,7 +248,7 @@ Valid `<type>`'s include:
--show-scope:: --show-scope::
Similar to `--show-origin` in that it augments the output of Similar to `--show-origin` in that it augments the output of
all queried config options with the scope of that value all queried config options with the scope of that value
(local, global, system, command). (worktree, local, global, system, command).
--get-colorbool <name> [<stdout-is-tty>]:: --get-colorbool <name> [<stdout-is-tty>]::

9
t/t1300-config.sh
View File

@ -2024,8 +2024,17 @@ test_expect_success '--show-scope with --list' '
local user.override=local local user.override=local
local include.path=../include/relative.include local include.path=../include/relative.include
local user.relative=include local user.relative=include
local core.repositoryformatversion=1
local extensions.worktreeconfig=true
worktree user.worktree=true
command user.cmdline=true command user.cmdline=true
EOF EOF
git worktree add wt1 &&
# We need these to test for worktree scope, but outside of this
# test, this is just noise
test_config core.repositoryformatversion 1 &&
test_config extensions.worktreeConfig true &&
git config --worktree user.worktree true &&
git -c user.cmdline=true config --list --show-scope >output && git -c user.cmdline=true config --list --show-scope >output &&
test_cmp expect output test_cmp expect output
' '