From 6061601d9f1f1c95da5f9304c319218f7cc3ec75 Mon Sep 17 00:00:00 2001 From: Glen Choo Date: Thu, 14 Jul 2022 21:28:00 +0000 Subject: safe.directory: use git_protected_config() Use git_protected_config() to read `safe.directory` instead of read_very_early_config(), making it 'protected configuration only'. As a result, `safe.directory` now respects "-c", so update the tests and docs accordingly. It used to ignore "-c" due to how it was implemented, not because of security or correctness concerns [1]. [1] https://lore.kernel.org/git/xmqqlevabcsu.fsf@gitster.g/ Signed-off-by: Glen Choo Signed-off-by: Junio C Hamano --- setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.c') diff --git a/setup.c b/setup.c index 09b6549ba9..ec5b9139e3 100644 --- a/setup.c +++ b/setup.c @@ -1155,7 +1155,7 @@ static int ensure_valid_ownership(const char *gitfile, * constant regardless of what failed above. data.is_safe should be * initialized to false, and might be changed by the callback. */ - read_very_early_config(safe_directory_cb, &data); + git_protected_config(safe_directory_cb, &data); return data.is_safe; } -- cgit v1.2.3