From: Derrick Stolee via GitGitGadget Date: Mon, 08 Jun 2026 13:57:06 GMT Subject: [PATCH 3/3] git: add --no-includes top-level option Message-ID: <1b4ae3cc0b9bc18f0b001587e93ce83cf3dfa819.1780927027.git.gitgitgadget@gmail.com> In-Reply-To: From: Derrick Stolee The previous change added a GIT_CONFIG_INCLUDES=0 override in the environment, similar to GIT_ADVICE=0. Follow the same model as --no-advice to add a --no-includes option to the top-level Git options. Signed-off-by: Derrick Stolee --- Documentation/git.adoc | 6 +++++- git.c | 6 +++++- t/t1305-config-include.sh | 8 ++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Documentation/git.adoc b/Documentation/git.adoc index 8a5cdd3b3d..f220427930 100644 --- a/Documentation/git.adoc +++ b/Documentation/git.adoc @@ -12,7 +12,7 @@ SYNOPSIS 'git' [-v | --version] [-h | --help] [-C ] [-c =] [--exec-path[=]] [--html-path] [--man-path] [--info-path] [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-lazy-fetch] - [--no-optional-locks] [--no-advice] [--bare] [--git-dir=] + [--no-optional-locks] [--no-advice] [--no-includes] [--bare] [--git-dir=] [--work-tree=] [--namespace=] [--config-env==] [] @@ -194,6 +194,10 @@ If you just want to run git as if it was started in `` then use --no-advice:: Disable all advice hints from being printed. +--no-includes:: + Disable all `include.path` and `includeIf.*` config directives. + See linkgit:git-config[1] for more information. + --literal-pathspecs:: Treat pathspecs literally (i.e. no globbing, no pathspec magic). This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment diff --git a/git.c b/git.c index 36f08891ef..52cfbf0e23 100644 --- a/git.c +++ b/git.c @@ -40,7 +40,7 @@ const char git_usage_string[] = N_("git [-v | --version] [-h | --help] [-C ] [-c =]\n" " [--exec-path[=]] [--html-path] [--man-path] [--info-path]\n" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-lazy-fetch]\n" - " [--no-optional-locks] [--no-advice] [--bare] [--git-dir=]\n" + " [--no-optional-locks] [--no-advice] [--no-includes] [--bare] [--git-dir=]\n" " [--work-tree=] [--namespace=] [--config-env==]\n" " []"); @@ -354,6 +354,10 @@ static int handle_options(const char ***argv, int *argc, int *envchanged) setenv(GIT_ADVICE_ENVIRONMENT, "0", 1); if (envchanged) *envchanged = 1; + } else if (!strcmp(cmd, "--no-includes")) { + setenv(CONFIG_INCLUDES_ENVIRONMENT, "0", 1); + if (envchanged) + *envchanged = 1; } else { fprintf(stderr, _("unknown option: %s\n"), cmd); usage(git_usage_string); diff --git a/t/t1305-config-include.sh b/t/t1305-config-include.sh index 270e4b89ab..b636e5ae7b 100755 --- a/t/t1305-config-include.sh +++ b/t/t1305-config-include.sh @@ -409,8 +409,11 @@ test_expect_success 'GIT_CONFIG_INCLUDES=0 disables include.path and includeIf' git config get foo.baz && test_must_fail env GIT_CONFIG_INCLUDES=0 git config get foo.bar && test_must_fail env GIT_CONFIG_INCLUDES=0 git config get foo.baz && + test_must_fail git --no-includes config get foo.bar && + test_must_fail git --no-includes config get foo.baz && git config get --includes foo.bar && - test_must_fail env GIT_CONFIG_INCLUDES=0 git config get --includes foo.bar + test_must_fail env GIT_CONFIG_INCLUDES=0 git config get --includes foo.bar && + test_must_fail git --no-includes config get --includes foo.bar ) ' @@ -423,7 +426,8 @@ test_expect_success 'GIT_CONFIG_INCLUDES=0 blocks included alias override' ' git config set include.path config.inc && git config set -f .git/config.inc alias.test status && git test && - test_must_fail env GIT_CONFIG_INCLUDES=0 git test + test_must_fail env GIT_CONFIG_INCLUDES=0 git test && + test_must_fail git --no-includes test ) ' -- gitgitgadget