mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/implicit-true'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2023-12-20 10:14:54 -08:00
parent 67dfb897b3 d49cb162fa
commit 2b9cbc6d01
18 changed files with 85 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/log.c
View File

@ -594,8 +594,11 @@ static int git_log_config(const char *var, const char *value,
decoration_style = 0; /* maybe warn? */
return 0;
}
if (!strcmp(var, "log.diffmerges"))
if (!strcmp(var, "log.diffmerges")) {
if (!value)
return config_error_nonbool(var);
return diff_merges_config(value);
}
if (!strcmp(var, "log.showroot")) {
default_show_root = git_config_bool(var, value);
return 0;