diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-12-20 10:14:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-20 10:14:54 -0800 |
| commit | 2b9cbc6d01ba3e54de09efde1dd2ed46c2d36e94 (patch) | |
| tree | 6ccb23924e2b2d806b3d67cf3796d3d7ad4695a2 /submodule-config.c | |
| parent | 67dfb897b3ea438a5a7bb29af2cd0360235e5191 (diff) | |
| parent | d49cb162fa752d62cf20548ae057471d348e42ae (diff) | |
| download | git-2b9cbc6d01ba3e54de09efde1dd2ed46c2d36e94.tar.xz | |
Merge branch 'jk/implicit-true'
Some codepaths did not correctly parse configuration variables
specified with valueless "true", which has been corrected.
* jk/implicit-true:
fsck: handle NULL value when parsing message config
trailer: handle NULL value when parsing trailer-specific config
submodule: handle NULL value when parsing submodule.*.branch
help: handle NULL value for alias.* config
trace2: handle NULL values in tr2_sysenv config callback
setup: handle NULL value when parsing extensions
config: handle NULL value when parsing non-bools
Diffstat (limited to 'submodule-config.c')
| -rw-r--r-- | submodule-config.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/submodule-config.c b/submodule-config.c index 6a48fd12f6..f4dd482abc 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -516,7 +516,9 @@ static int parse_config(const char *var, const char *value, submodule->recommend_shallow = git_config_bool(var, value); } else if (!strcmp(item.buf, "branch")) { - if (!me->overwrite && submodule->branch) + if (!value) + ret = config_error_nonbool(var); + else if (!me->overwrite && submodule->branch) warn_multiple_config(me->treeish_name, submodule->name, "branch"); else { |