summaryrefslogtreecommitdiffabout
path: root/cgit.c
authorJason A. Donenfeld <Jason@zx2c4.com>2010-08-03 22:45:42 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-08-20 16:57:30 (UTC)
commit379e80e3a83481d3639c5d312eeddcce57c486b2 (patch) (unidiff)
tree474ac38e3812008532d4ebd0b095ac835b5478b5 /cgit.c
parentaec9c245e7eaf444c7ae1851e3eda3b30748950f (diff)
downloadcgit-379e80e3a83481d3639c5d312eeddcce57c486b2.zip
cgit-379e80e3a83481d3639c5d312eeddcce57c486b2.tar.gz
cgit-379e80e3a83481d3639c5d312eeddcce57c486b2.tar.bz2
Support refspecs in about-filter.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'cgit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c
index eff5b7a..4f2c752 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,15 +1,16 @@
1/* cgit.c: cgi for the git scm 1/* cgit.c: cgi for the git scm
2 * 2 *
3 * Copyright (C) 2006 Lars Hjemli 3 * Copyright (C) 2006 Lars Hjemli
4 * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com>
4 * 5 *
5 * Licensed under GNU General Public License v2 6 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 7 * (see COPYING for full license text)
7 */ 8 */
8 9
9#include "cgit.h" 10#include "cgit.h"
10#include "cache.h" 11#include "cache.h"
11#include "cmd.h" 12#include "cmd.h"
12#include "configfile.h" 13#include "configfile.h"
13#include "html.h" 14#include "html.h"
14#include "ui-shared.h" 15#include "ui-shared.h"
15#include "ui-stats.h" 16#include "ui-stats.h"
@@ -62,25 +63,26 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
62 repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); 63 repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
63 else if (!strcmp(name, "enable-remote-branches")) 64 else if (!strcmp(name, "enable-remote-branches"))
64 repo->enable_remote_branches = atoi(value); 65 repo->enable_remote_branches = atoi(value);
65 else if (!strcmp(name, "enable-subject-links")) 66 else if (!strcmp(name, "enable-subject-links"))
66 repo->enable_subject_links = atoi(value); 67 repo->enable_subject_links = atoi(value);
67 else if (!strcmp(name, "max-stats")) 68 else if (!strcmp(name, "max-stats"))
68 repo->max_stats = cgit_find_stats_period(value, NULL); 69 repo->max_stats = cgit_find_stats_period(value, NULL);
69 else if (!strcmp(name, "module-link")) 70 else if (!strcmp(name, "module-link"))
70 repo->module_link= xstrdup(value); 71 repo->module_link= xstrdup(value);
71 else if (!strcmp(name, "section")) 72 else if (!strcmp(name, "section"))
72 repo->section = xstrdup(value); 73 repo->section = xstrdup(value);
73 else if (!strcmp(name, "readme") && value != NULL) { 74 else if (!strcmp(name, "readme") && value != NULL) {
74 if (*value == '/') 75 char *colon;
76 if (*value == '/' || ((colon = strchr(value, ':')) != NULL && colon != value && *(colon + 1) != '\0'))
75 repo->readme = xstrdup(value); 77 repo->readme = xstrdup(value);
76 else 78 else
77 repo->readme = xstrdup(fmt("%s/%s", repo->path, value)); 79 repo->readme = xstrdup(fmt("%s/%s", repo->path, value));
78 } else if (ctx.cfg.enable_filter_overrides) { 80 } else if (ctx.cfg.enable_filter_overrides) {
79 if (!strcmp(name, "about-filter")) 81 if (!strcmp(name, "about-filter"))
80 repo->about_filter = new_filter(value, 0); 82 repo->about_filter = new_filter(value, 0);
81 else if (!strcmp(name, "commit-filter")) 83 else if (!strcmp(name, "commit-filter"))
82 repo->commit_filter = new_filter(value, 0); 84 repo->commit_filter = new_filter(value, 0);
83 else if (!strcmp(name, "source-filter")) 85 else if (!strcmp(name, "source-filter"))
84 repo->source_filter = new_filter(value, 1); 86 repo->source_filter = new_filter(value, 1);
85 } 87 }
86} 88}