diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2017-04-17 17:10:01 +0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-04-17 19:18:43 -0700 |
commit | 2185fde56328942d5be9603cc199ee7c6d004085 (patch) | |
tree | 60ec4938c2561fe46a9c555245540279d4a7778b /Documentation/manpage-suppress-sp.xsl | |
parent | config: prepare to pass more info in git_config_with_options() (diff) | |
download | tgif-2185fde56328942d5be9603cc199ee7c6d004085.tar.xz |
config: handle conditional include when $GIT_DIR is not set up
If setup_git_directory() and friends have not been called,
get_git_dir() (because of includeIf.gitdir:XXX) would lead to
die("BUG: setup_git_env called without repository");
There are two cases when a config file could be read before $GIT_DIR
is located.
The first one is check_repository_format(), where we read just the one
file $GIT_DIR/config to check if we could understand this
repository. This case should be safe. We do not parse include
directives, which can only be triggered from git_config_with_options,
but setup code uses a lower-level function. The concerned variables
should never be hidden away behind includes anyway.
The second one is triggered in check_pager_config() when we're about
to run an external git command. We might be able to find $GIT_DIR in
this case, which is exactly what read_early_config() does (and also is
what check_pager_config() uses). Conditional includes and
get_git_dir() could be triggered by the first
git_config_with_options() call there, before discover_git_directory()
is used as a fallback $GIT_DIR detection.
Detect this special "early reading" case, pass down the $GIT_DIR,
either from previous setup or detected by discover_git_directory(),
and make conditional include use it.
Noticed-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/manpage-suppress-sp.xsl')
0 files changed, 0 insertions, 0 deletions