summaryrefslogtreecommitdiff
path: root/cgit.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2010-09-19 18:43:58 +0200
committerLars Hjemli <hjemli@gmail.com>2010-09-19 18:43:58 +0200
commite76a1ea427792aaa331cdec70d7d4ff1fb3422e0 (patch)
treefaeee0c46a2d470b29b46481f74070557e3fdb8d /cgit.c
parent857696dd3d85f7c12c718a46d82a2405e6a9919a (diff)
parent515edb0da3b9156e07e269621d7474cdea82acaf (diff)
downloadcgit-e76a1ea427792aaa331cdec70d7d4ff1fb3422e0.tar.gz
cgit-e76a1ea427792aaa331cdec70d7d4ff1fb3422e0.tar.bz2
cgit-e76a1ea427792aaa331cdec70d7d4ff1fb3422e0.zip
Merge branch 'lh/readme'
Diffstat (limited to '')
-rw-r--r--cgit.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/cgit.c b/cgit.c
index d6146e2..04cef23 100644
--- a/cgit.c
+++ b/cgit.c
@@ -72,11 +72,7 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
else if (!strcmp(name, "section"))
repo->section = xstrdup(value);
else if (!strcmp(name, "readme") && value != NULL) {
- char *colon;
- if (*value == '/' || ((colon = strchr(value, ':')) != NULL && colon != value && *(colon + 1) != '\0'))
- repo->readme = xstrdup(value);
- else
- repo->readme = xstrdup(fmt("%s/%s", repo->path, value));
+ repo->readme = xstrdup(value);
} else if (ctx.cfg.enable_filter_overrides) {
if (!strcmp(name, "about-filter"))
repo->about_filter = new_filter(value, 0);
@@ -97,6 +93,8 @@ void config_cb(const char *name, const char *value)
ctx.repo->path = trim_end(value, '/');
else if (ctx.repo && !prefixcmp(name, "repo."))
repo_config(ctx.repo, name + 5, value);
+ else if (!strcmp(name, "readme"))
+ ctx.cfg.readme = xstrdup(value);
else if (!strcmp(name, "root-title"))
ctx.cfg.root_title = xstrdup(value);
else if (!strcmp(name, "root-desc"))
© 'Necoro' Neumann3-10/+5 2020-04-21Update README.mdRenĂ© 'Necoro' Neumann1-0/+2 2020-04-21Improved HTML creationRenĂ© 'Necoro' Neumann4-3/+22 2020-04-21Upload mails to imapRenĂ© 'Necoro' Neumann3-35/+80 2020-04-21Move HTML template to stringRenĂ© 'Necoro' Neumann3-12/+13 2020-04-21HTML Template part of the mailRenĂ© 'Necoro' Neumann7-18/+199 2020-04-20Fixes and validationRenĂ© 'Necoro' Neumann6-28/+25 2020-04-20Fix vettingRenĂ© 'Necoro' Neumann1-1/+1 2020-04-20Started with mail creationRenĂ© 'Necoro' Neumann4-3/+126 2020-04-20FeeditemsRenĂ© 'Necoro' Neumann2-2/+14 2020-04-20GlobalOptionsRenĂ© 'Necoro' Neumann3-25/+79 2020-04-19RestructureRenĂ© 'Necoro' Neumann6-152/+177 2020-04-19Rename package 'parse' to 'feed'RenĂ© 'Necoro' Neumann2-3/+3 2020-04-19SELECT is not necessary for most operations -- skip itRenĂ© 'Necoro' Neumann2-12/+1 2020-04-19Store path as array -- the delimiter is not always '.'RenĂ© 'Necoro' Neumann3-36/+44 2020-04-19Split client part to client.goRenĂ© 'Necoro' Neumann2-125/+137 2020-04-19IMAP: Create foldersRenĂ© 'Necoro' Neumann1-4/+38 2020-04-19Improved IMAPRenĂ© 'Necoro' Neumann1-3/+88 2020-04-19Started IMAP connectionRenĂ© 'Necoro' Neumann4-0/+152 2020-04-19Use our own logger for debug for convenience sakeRenĂ© 'Necoro' Neumann1-2/+3 2020-04-19Fix debug logging m(RenĂ© 'Necoro' Neumann1-2/+2 2020-04-19Rename util.go to log.go. Add verbose modeRenĂ© 'Necoro' Neumann4-24/+54 2020-04-19Clean go.modRenĂ© 'Necoro' Neumann2-3/+0 2020-04-19Do not print the parsedCfg anymoreRenĂ© 'Necoro' Neumann1-1/+1 2020-04-19Increase go-version to 1.14RenĂ© 'Necoro' Neumann1-2/+2 2020-04-19CI: go vetRenĂ© 'Necoro' Neumann1-0/+3 2020-04-19Fetching and parsing the feedsRenĂ© 'Necoro' Neumann5-4/+113 2020-04-19Ignore all config*.ymlRenĂ© 'Necoro' Neumann1-1/+1