| author | Lars Hjemli <hjemli@gmail.com> | 2009-12-08 17:30:02 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-12-08 17:30:02 (UTC) |
| commit | 5c34d96f7e000eb47418ac9e39dabf92b767c9f2 (patch) (unidiff) | |
| tree | b5db40ff125329f897cef3b81131a637fb3a56af /cgit.c | |
| parent | e633ccf714eb423c4522924c3b611dac2e176c5e (diff) | |
| parent | f2bf0a05280edddb4961214adfd7b440191737e2 (diff) | |
| download | cgit-5c34d96f7e000eb47418ac9e39dabf92b767c9f2.zip cgit-5c34d96f7e000eb47418ac9e39dabf92b767c9f2.tar.gz cgit-5c34d96f7e000eb47418ac9e39dabf92b767c9f2.tar.bz2 | |
Merge branch 'stable'
| -rw-r--r-- | cgit.c | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -65,15 +65,15 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) | |||
| 65 | else if (!strcmp(name, "module-link")) | 65 | else if (!strcmp(name, "module-link")) |
| 66 | repo->module_link= xstrdup(value); | 66 | repo->module_link= xstrdup(value); |
| 67 | else if (!strcmp(name, "section")) | 67 | else if (!strcmp(name, "section")) |
| 68 | repo->section = xstrdup(value); | 68 | repo->section = xstrdup(value); |
| 69 | else if (!strcmp(name, "readme") && value != NULL) { | 69 | else if (!strcmp(name, "readme") && value != NULL) { |
| 70 | if (*value == '/') | 70 | if (*value == '/') |
| 71 | ctx.repo->readme = xstrdup(value); | 71 | repo->readme = xstrdup(value); |
| 72 | else | 72 | else |
| 73 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); | 73 | repo->readme = xstrdup(fmt("%s/%s", repo->path, value)); |
| 74 | } else if (ctx.cfg.enable_filter_overrides) { | 74 | } else if (ctx.cfg.enable_filter_overrides) { |
| 75 | if (!strcmp(name, "about-filter")) | 75 | if (!strcmp(name, "about-filter")) |
| 76 | repo->about_filter = new_filter(value, 0); | 76 | repo->about_filter = new_filter(value, 0); |
| 77 | else if (!strcmp(name, "commit-filter")) | 77 | else if (!strcmp(name, "commit-filter")) |
| 78 | repo->commit_filter = new_filter(value, 0); | 78 | repo->commit_filter = new_filter(value, 0); |
| 79 | else if (!strcmp(name, "source-filter")) | 79 | else if (!strcmp(name, "source-filter")) |