aboutsummaryrefslogtreecommitdiffstats
path: root/setup.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-12-05 14:49:56 +0900
committerJunio C Hamano <gitster@pobox.com>2025-12-05 14:49:56 +0900
commit0534b78576b410d10e2cfb61802ea829713bde03 (patch)
tree1c6c71b66cf0491260d82ae7008782e7b9ddcc68 /setup.c
parent5eadcbf8151f04d5c5bf0b8865ee8fa8447878f7 (diff)
parent0bd16856ffb3968de73699ad0555d1fae6c45406 (diff)
downloadgit-0534b78576b410d10e2cfb61802ea829713bde03.tar.gz
Merge branch 'jc/optional-path'
"git config get --path" segfaulted on an ":(optional)path" that does not exist, which has been corrected. * jc/optional-path: config: really treat missing optional path as not configured config: really pretend missing :(optional) value is not there config: mark otherwise unused function as file-scope static
Diffstat (limited to 'setup.c')
-rw-r--r--setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.c b/setup.c
index 7086741e6c..cf47441b7b 100644
--- a/setup.c
+++ b/setup.c
@@ -1248,7 +1248,7 @@ static int safe_directory_cb(const char *key, const char *value,
} else {
char *allowed = NULL;
- if (!git_config_pathname(&allowed, key, value)) {
+ if (!git_config_pathname(&allowed, key, value) && allowed) {
char *normalized = NULL;
/*