summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-08-05 22:51:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-08-05 22:51:36 (GMT)
commitd16978517c20911cbef6f98b78c6ec84ae1be57d (patch)
tree41a6fe423dcac26f675c46e7caf53007ec0e9b54
parenta75163119c0f99cf3abff495c0fa35e55cd4cfa1 (diff)
parent07aed5801722635684b5f0f8f3c26903fdd11f8e (diff)
downloadgit-d16978517c20911cbef6f98b78c6ec84ae1be57d.zip
git-d16978517c20911cbef6f98b78c6ec84ae1be57d.tar.gz
git-d16978517c20911cbef6f98b78c6ec84ae1be57d.tar.bz2
Merge branch 'mb/config-document-include' into maint
Add missing documentation for "include" and "includeIf" features in "git config" file format, which incidentally teaches the command line completion to include them in its offerings. source: <pull.1285.v2.git.1658002423864.gitgitgadget@gmail.com> * mb/config-document-include: config.txt: document include, includeIf
-rw-r--r--Documentation/config.txt2
-rw-r--r--Documentation/config/includeif.txt6
-rwxr-xr-xt/t9902-completion.sh13
3 files changed, 21 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e376d54..5b5b976 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -445,6 +445,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 0000000..82fe431
--- /dev/null
+++ b/Documentation/config/includeif.txt
@@ -0,0 +1,6 @@
+include.path::
+includeIf.<condition>.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 31526e6..43de868 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -2485,6 +2485,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
@@ -2493,6 +2500,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