git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ferry Huberts <mailings@hupie.com>
To: git@vger.kernel.org
Cc: hjemli@gmail.com
Subject: [CGit] [PATCH 6/6] about_filter: also communicate the repo name to the filter
Date: Thu, 17 Feb 2011 22:11:09 +0100	[thread overview]
Message-ID: <1297977069-21884-7-git-send-email-mailings@hupie.com> (raw)
In-Reply-To: <1297977069-21884-1-git-send-email-mailings@hupie.com>

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

  parent reply	other threads:[~2011-02-17 21:11 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-17 21:11 [CGit] [PATCH 0/6] Communicate the repo name to the filter scripts Ferry Huberts
2011-02-17 21:11 ` [CGit] [PATCH 1/6] source_filter: fix a memory leak Ferry Huberts
2011-02-17 21:11 ` [CGit] [PATCH 2/6] new_filter: correctly initialise all arguments for a new filter Ferry Huberts
2011-02-17 21:11 ` [CGit] [PATCH 3/6] new_filter: determine extra_args from filter type Ferry Huberts
2011-02-17 21:11 ` [CGit] [PATCH 4/6] source_filter: also communicate the repo name to the filter Ferry Huberts
2011-02-17 21:11 ` [CGit] [PATCH 5/6] commit_filter: " Ferry Huberts
2011-02-17 21:11 ` Ferry Huberts [this message]
2011-02-17 21:23 ` [CGit] [PATCH 0/6] Communicate the repo name to the filter scripts Ferry Huberts
2011-02-19  8:46 ` Lars Hjemli
2011-02-19 13:54   ` Ferry Huberts
2011-02-24 13:32   ` Ferry Huberts

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1297977069-21884-7-git-send-email-mailings@hupie.com \
    --to=mailings@hupie.com \
    --cc=git@vger.kernel.org \
    --cc=hjemli@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).