[CGit] [PATCH 6/6] about_filter: also communicate the repo name to the filter
From: Ferry Huberts <ferry.huberts@pelagic.nl>
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
---
cgit.c | 3 ---
ui-repolist.c | 5 ++++-
ui-summary.c | 5 ++++-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/cgit.c b/cgit.c
index 9e8c4c4..653b099 100644
--- a/cgit.c
+++ b/cgit.c
@@ -41,9 +41,6 @@ struct cgit_filter *new_filter(const char *cmd, filter_type filtertype)
switch (filtertype) {
case about:
- extra_args = 0;
- break;
-
case commit:
extra_args = 1;
break;
diff --git a/ui-repolist.c b/ui-repolist.c
index 2c98668..a0c2235 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -290,8 +290,11 @@ void cgit_print_site_readme()
{
if (!ctx.cfg.root_readme)
return;
- if (ctx.cfg.about_filter)
+ if (ctx.cfg.about_filter) {
+ if (!ctx.repo->about_filter->argv[1])
+ ctx.repo->about_filter->argv[1] = xstrdup(ctx.repo->name);
cgit_open_filter(ctx.cfg.about_filter);
+ }
html_include(ctx.cfg.root_readme);
if (ctx.cfg.about_filter)
cgit_close_filter(ctx.cfg.about_filter);
diff --git a/ui-summary.c b/ui-summary.c
index b203bcc..f8c85a2 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -112,8 +112,11 @@ void cgit_print_repo_readme(char *path)
* filesystem, while applying the about-filter.
*/
html("<div id='summary'>");
- if (ctx.repo->about_filter)
+ if (ctx.repo->about_filter) {
+ if (!ctx.repo->about_filter->argv[1])
+ ctx.repo->about_filter->argv[1] = xstrdup(ctx.repo->name);
cgit_open_filter(ctx.repo->about_filter);
+ }
if (ref)
cgit_print_file(tmp, ref);
else
--
1.7.4
Ferry Huberts <mailings@hupie.com>