repo_config: do not let globals override repo settings
This makes it possible to activate the enable_commit_graph,
enable_log_filecount, and enable_log_linecount for individual
repositories, even if the global setting is "0" (default).
The commit that introduced the broken behavior was e189344
, and the
commit message of that makes it clear that this wasn't the intended
behavior.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Αυτή η υποβολή περιλαμβάνεται σε:
γονέας
a9a6a20560
υποβολή
8f40be229c
6
cgit.c
6
cgit.c
@ -75,11 +75,11 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
|
||||
else if (!strcmp(name, "snapshots"))
|
||||
repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value);
|
||||
else if (!strcmp(name, "enable-commit-graph"))
|
||||
repo->enable_commit_graph = ctx.cfg.enable_commit_graph * atoi(value);
|
||||
repo->enable_commit_graph = atoi(value);
|
||||
else if (!strcmp(name, "enable-log-filecount"))
|
||||
repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
|
||||
repo->enable_log_filecount = atoi(value);
|
||||
else if (!strcmp(name, "enable-log-linecount"))
|
||||
repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
|
||||
repo->enable_log_linecount = atoi(value);
|
||||
else if (!strcmp(name, "enable-remote-branches"))
|
||||
repo->enable_remote_branches = atoi(value);
|
||||
else if (!strcmp(name, "enable-subject-links"))
|
||||
|
Φόρτωση…
Αναφορά σε νέο ζήτημα
Block a user