From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 8 Dec 2009 17:30:02 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/5c34d96f7e000eb47418ac9e39dabf92b767c9f2?hp=-c

Merge branch 'stable'
---

5c34d96f7e000eb47418ac9e39dabf92b767c9f2
diff --combined cgit.c
index a17f40d,6bb712d..bfde9f9
--- a/cgit.c
+++ b/cgit.c
@@@ -68,9 -68,9 +68,9 @@@ void repo_config(struct cgit_repo *repo
  		repo->section = xstrdup(value);
  	else if (!strcmp(name, "readme") && value != NULL) {
  		if (*value == '/')
- 			ctx.repo->readme = xstrdup(value);
+ 			repo->readme = xstrdup(value);
  		else
- 			ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value));
+ 			repo->readme = xstrdup(fmt("%s/%s", repo->path, value));
  	} else if (ctx.cfg.enable_filter_overrides) {
  		if (!strcmp(name, "about-filter"))
  			repo->about_filter = new_filter(value, 0);
@@@ -209,8 -209,6 +209,8 @@@ static void querystring_cb(const char *
  	} else if (!strcmp(name, "p")) {
  		ctx.qry.page = xstrdup(value);
  	} else if (!strcmp(name, "url")) {
 +		if (*value == '/')
 +			value++;
  		ctx.qry.url = xstrdup(value);
  		cgit_parse_url(value);
  	} else if (!strcmp(name, "qt")) {