mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 16:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

repo_config: do not let globals override repo settings

Browse Source 
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>
This commit is contained in:
Tobias Bieniek 2012-04-18 12:32:13 +02:00 committed by Jason A. Donenfeld
parent a9a6a20560
commit 8f40be229c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cgit.c
View File

@ -75,11 +75,11 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
else if (!strcmp(name, "snapshots")) else if (!strcmp(name, "snapshots"))
repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value);
else if (!strcmp(name, "enable-commit-graph")) 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")) 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")) 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")) else if (!strcmp(name, "enable-remote-branches"))
repo->enable_remote_branches = atoi(value); repo->enable_remote_branches = atoi(value);
else if (!strcmp(name, "enable-subject-links")) else if (!strcmp(name, "enable-subject-links"))