From db7961e6a69f648e8a1359c23830ff59d7341092 Mon Sep 17 00:00:00 2001 From: Glen Choo Date: Tue, 7 Jun 2022 21:24:04 +0000 Subject: [PATCH] config: document and test the 'worktree' scope 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 Signed-off-by: Junio C Hamano --- Documentation/git-config.txt | 2 +- t/t1300-config.sh | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index bdcfd94b64..9376e39aef 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -248,7 +248,7 @@ Valid ``'s include: --show-scope:: Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value - (local, global, system, command). + (worktree, local, global, system, command). --get-colorbool []:: diff --git a/t/t1300-config.sh b/t/t1300-config.sh index 7dd9b325d9..d3d9adbb3d 100755 --- a/t/t1300-config.sh +++ b/t/t1300-config.sh @@ -2024,8 +2024,17 @@ test_expect_success '--show-scope with --list' ' local user.override=local local include.path=../include/relative.include local user.relative=include + local core.repositoryformatversion=1 + local extensions.worktreeconfig=true + worktree user.worktree=true command user.cmdline=true 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 && test_cmp expect output ' -- 2.11.4.GIT