author | Jason A. Donenfeld <Jason@zx2c4.com> | 2010-07-29 18:38:01 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-08-04 01:09:32 (UTC) |
commit | 119397b175874bd606952e93b7249ae4ffb9afbe (patch) (unidiff) | |
tree | 98f6a7d5661a52120c11088ee474a2a5d7449f60 /cgit.c | |
parent | 2e4a941626c240bc7858aa7564882c01f657f4e8 (diff) | |
download | cgit-119397b175874bd606952e93b7249ae4ffb9afbe.zip cgit-119397b175874bd606952e93b7249ae4ffb9afbe.tar.gz cgit-119397b175874bd606952e93b7249ae4ffb9afbe.tar.bz2 |
Add support for 'enable-gitweb-owner' option
When this option is enabled (which it is by default), cgit will lookup
the 'gitweb.owner' setting in each git config file found when processing
the 'scan-path' option.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -126,24 +126,26 @@ void config_cb(const char *name, const char *value) | |||
126 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) | 126 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
127 | ctx.cfg.virtual_root = ""; | 127 | ctx.cfg.virtual_root = ""; |
128 | } else if (!strcmp(name, "nocache")) | 128 | } else if (!strcmp(name, "nocache")) |
129 | ctx.cfg.nocache = atoi(value); | 129 | ctx.cfg.nocache = atoi(value); |
130 | else if (!strcmp(name, "noplainemail")) | 130 | else if (!strcmp(name, "noplainemail")) |
131 | ctx.cfg.noplainemail = atoi(value); | 131 | ctx.cfg.noplainemail = atoi(value); |
132 | else if (!strcmp(name, "noheader")) | 132 | else if (!strcmp(name, "noheader")) |
133 | ctx.cfg.noheader = atoi(value); | 133 | ctx.cfg.noheader = atoi(value); |
134 | else if (!strcmp(name, "snapshots")) | 134 | else if (!strcmp(name, "snapshots")) |
135 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 135 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
136 | else if (!strcmp(name, "enable-filter-overrides")) | 136 | else if (!strcmp(name, "enable-filter-overrides")) |
137 | ctx.cfg.enable_filter_overrides = atoi(value); | 137 | ctx.cfg.enable_filter_overrides = atoi(value); |
138 | else if (!strcmp(name, "enable-gitweb-owner")) | ||
139 | ctx.cfg.enable_gitweb_owner = atoi(value); | ||
138 | else if (!strcmp(name, "enable-index-links")) | 140 | else if (!strcmp(name, "enable-index-links")) |
139 | ctx.cfg.enable_index_links = atoi(value); | 141 | ctx.cfg.enable_index_links = atoi(value); |
140 | else if (!strcmp(name, "enable-log-filecount")) | 142 | else if (!strcmp(name, "enable-log-filecount")) |
141 | ctx.cfg.enable_log_filecount = atoi(value); | 143 | ctx.cfg.enable_log_filecount = atoi(value); |
142 | else if (!strcmp(name, "enable-log-linecount")) | 144 | else if (!strcmp(name, "enable-log-linecount")) |
143 | ctx.cfg.enable_log_linecount = atoi(value); | 145 | ctx.cfg.enable_log_linecount = atoi(value); |
144 | else if (!strcmp(name, "enable-remote-branches")) | 146 | else if (!strcmp(name, "enable-remote-branches")) |
145 | ctx.cfg.enable_remote_branches = atoi(value); | 147 | ctx.cfg.enable_remote_branches = atoi(value); |
146 | else if (!strcmp(name, "enable-subject-links")) | 148 | else if (!strcmp(name, "enable-subject-links")) |
147 | ctx.cfg.enable_subject_links = atoi(value); | 149 | ctx.cfg.enable_subject_links = atoi(value); |
148 | else if (!strcmp(name, "enable-tree-linenumbers")) | 150 | else if (!strcmp(name, "enable-tree-linenumbers")) |
149 | ctx.cfg.enable_tree_linenumbers = atoi(value); | 151 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
@@ -284,24 +286,25 @@ static void prepare_context(struct cgit_context *ctx) | |||
284 | ctx->cfg.nocache = 0; | 286 | ctx->cfg.nocache = 0; |
285 | ctx->cfg.cache_size = 0; | 287 | ctx->cfg.cache_size = 0; |
286 | ctx->cfg.cache_dynamic_ttl = 5; | 288 | ctx->cfg.cache_dynamic_ttl = 5; |
287 | ctx->cfg.cache_max_create_time = 5; | 289 | ctx->cfg.cache_max_create_time = 5; |
288 | ctx->cfg.cache_repo_ttl = 5; | 290 | ctx->cfg.cache_repo_ttl = 5; |
289 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 291 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
290 | ctx->cfg.cache_root_ttl = 5; | 292 | ctx->cfg.cache_root_ttl = 5; |
291 | ctx->cfg.cache_scanrc_ttl = 15; | 293 | ctx->cfg.cache_scanrc_ttl = 15; |
292 | ctx->cfg.cache_static_ttl = -1; | 294 | ctx->cfg.cache_static_ttl = -1; |
293 | ctx->cfg.css = "/cgit.css"; | 295 | ctx->cfg.css = "/cgit.css"; |
294 | ctx->cfg.logo = "/cgit.png"; | 296 | ctx->cfg.logo = "/cgit.png"; |
295 | ctx->cfg.local_time = 0; | 297 | ctx->cfg.local_time = 0; |
298 | ctx->cfg.enable_gitweb_owner = 1; | ||
296 | ctx->cfg.enable_tree_linenumbers = 1; | 299 | ctx->cfg.enable_tree_linenumbers = 1; |
297 | ctx->cfg.max_repo_count = 50; | 300 | ctx->cfg.max_repo_count = 50; |
298 | ctx->cfg.max_commit_count = 50; | 301 | ctx->cfg.max_commit_count = 50; |
299 | ctx->cfg.max_lock_attempts = 5; | 302 | ctx->cfg.max_lock_attempts = 5; |
300 | ctx->cfg.max_msg_len = 80; | 303 | ctx->cfg.max_msg_len = 80; |
301 | ctx->cfg.max_repodesc_len = 80; | 304 | ctx->cfg.max_repodesc_len = 80; |
302 | ctx->cfg.max_blob_size = 0; | 305 | ctx->cfg.max_blob_size = 0; |
303 | ctx->cfg.max_stats = 0; | 306 | ctx->cfg.max_stats = 0; |
304 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 307 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
305 | ctx->cfg.project_list = NULL; | 308 | ctx->cfg.project_list = NULL; |
306 | ctx->cfg.renamelimit = -1; | 309 | ctx->cfg.renamelimit = -1; |
307 | ctx->cfg.remove_suffix = 0; | 310 | ctx->cfg.remove_suffix = 0; |