development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gc/document-config-worktree-scope'

Browse source 
Doc update.

* gc/document-config-worktree-scope:
  config: document and test the 'worktree' scope
This commit is contained in:
Junio C Hamano 2022-06-13 15:53:44 -07:00
parent da4827056a db7961e6a6
commit 21bb3851ee
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
' '