From 07aed5801722635684b5f0f8f3c26903fdd11f8e Mon Sep 17 00:00:00 2001 From: Manuel Boni Date: Sat, 16 Jul 2022 20:13:43 +0000 Subject: [PATCH] config.txt: document include, includeIf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Git config's tab completion does not yet know about the "include" and "includeIf" sections, nor the related "path" variable. Add a description for these two sections in 'Documentation/config/includeif.txt', which points to git-config's documentation, specifically the "Includes" and "Conditional Includes" subsections. As a side effect, tab completion can successfully complete the 'include', 'includeIf', and 'include.add' expressions. This effect is tested by two new ad-hoc tests. Variable completion only works for "include" for now. Credit for the ideas behind this patch goes to Ævar Arnfjörð Bjarmason. Helped-by: Ævar Arnfjörð Bjarmason Signed-off-by: Manuel Boni Signed-off-by: Junio C Hamano --- Documentation/config.txt | 2 ++ Documentation/config/includeif.txt | 6 ++++++ t/t9902-completion.sh | 13 +++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 Documentation/config/includeif.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 8d3f518083..12a89f6935 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -410,6 +410,8 @@ include::config/i18n.txt[] include::config/imap.txt[] +include::config/includeif.txt[] + include::config/index.txt[] include::config/init.txt[] diff --git a/Documentation/config/includeif.txt b/Documentation/config/includeif.txt new file mode 100644 index 0000000000..82fe431c34 --- /dev/null +++ b/Documentation/config/includeif.txt @@ -0,0 +1,6 @@ +include.path:: +includeIf..path:: + Special variables to include other configuration files. See + the "CONFIGURATION FILE" section in the main + linkgit:git-config[1] documentation, + specifically the "Includes" and "Conditional Includes" subsections. diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 98c6280632..80cc11e7ec 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -2330,6 +2330,13 @@ test_expect_success 'git config - section' ' EOF ' +test_expect_success 'git config - section include, includeIf' ' + test_completion "git config inclu" <<-\EOF + include.Z + includeIf.Z + EOF +' + test_expect_success 'git config - variable name' ' test_completion "git config log.d" <<-\EOF log.date Z @@ -2338,6 +2345,12 @@ test_expect_success 'git config - variable name' ' EOF ' +test_expect_success 'git config - variable name include' ' + test_completion "git config include.p" <<-\EOF + include.path Z + EOF +' + test_expect_success 'git config - value' ' test_completion "git config color.pager " <<-\EOF false Z