summaryrefslogtreecommitdiff
path: root/t/t3032-merge-recursive-space-options.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2017-03-13 21:11:08 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-14 14:24:16 -0700
commit267b4538c0e13f98870bf808ee6c71fca9cf2ef7 (patch)
tree4ae01f263447c974aeaf4204836706e3a2f35c36 /t/t3032-merge-recursive-space-options.sh
parentsetup: make read_early_config() reusable (diff)
downloadtgif-267b4538c0e13f98870bf808ee6c71fca9cf2ef7.tar.xz
read_early_config(): avoid .git/config hack when unneeded
So far, we only look whether the startup_info claims to have seen a git_dir. However, do_git_config_sequence() (and consequently the git_config_with_options() call used by read_early_config() asks the have_git_dir() function whether we have a .git/ directory, which in turn also looks at git_dir and at the environment variable GIT_DIR. And when this is the case, the repository config is handled already, so we do not have to do that again explicitly. Let's just use the same function, have_git_dir(), to determine whether we have to handle .git/config explicitly. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3032-merge-recursive-space-options.sh')
0 files changed, 0 insertions, 0 deletions