diff options
context:
space:
mode:
authorBryce Kwon <bryce@brycekwon.com>
committerBryce Kwon <bryce@brycekwon.com>
commit
parent
tree
download
Split trailers out of the commit message
Diffstat (limited to '')
-rw-r--r--source/cgit.c16
1 file changed, 14 insertions, 2 deletions
diff --git a/source/cgit.c b/source/cgit.c
index e6e8613..ae91dd2 100644
--- a/source/cgit.c
+++ b/source/cgit.c
@@ -247,6 +247,8 @@ static void print_repo(FILE *f, struct cgit_repo *repo)
cgit_fprintf_filter(repo->source_filter, f, "repo.source-filter=");
if (repo->email_filter && repo->email_filter != ctx.cfg.email_filter)
cgit_fprintf_filter(repo->email_filter, f, "repo.email-filter=");
+ if (repo->trailer_filter && repo->trailer_filter != ctx.cfg.trailer_filter)
+ cgit_fprintf_filter(repo->trailer_filter, f, "repo.trailer-filter=");
if (repo->snapshots != ctx.cfg.snapshots) {
char *formats = build_snapshot_setting(repo->snapshots);
fprintf(f, "repo.snapshots=%s\n", formats ? formats : "");
@@ -262,6 +264,7 @@ static void print_repo(FILE *f, struct cgit_repo *repo)
fprintf(f, "repo.logo-link=%s\n", repo->logo_link);
fprintf(f, "repo.enable-remote-branches=%d\n", repo->enable_remote_branches);
fprintf(f, "repo.enable-subject-links=%d\n", repo->enable_subject_links);
+ fprintf(f, "repo.enable-trailers=%d\n", repo->enable_trailers);
fprintf(f, "repo.enable-html-serving=%d\n", repo->enable_html_serving);
if (repo->branch_sort == 1)
fprintf(f, "repo.branch-sort=age\n");
@@ -560,6 +563,8 @@ static void apply_config(const char *name, const char *value)
ctx.cfg.enable_remote_branches = atoi(value);
else if (!strcmp(name, "enable-subject-links"))
ctx.cfg.enable_subject_links = atoi(value);
+ else if (!strcmp(name, "enable-trailers"))
+ ctx.cfg.enable_trailers = atoi(value);
else if (!strcmp(name, "enable-html-serving"))
ctx.cfg.enable_html_serving = atoi(value);
else if (!strcmp(name, "enable-tree-linenumbers"))
@@ -598,6 +603,8 @@ static void apply_config(const char *name, const char *value)
ctx.cfg.commit_filter = cgit_new_filter(value, COMMIT);
else if (!strcmp(name, "email-filter"))
ctx.cfg.email_filter = cgit_new_filter(value, EMAIL);
+ else if (!strcmp(name, "trailer-filter"))
+ ctx.cfg.trailer_filter = cgit_new_filter(value, TRAILER);
else if (!strcmp(name, "auth-filter"))
ctx.cfg.auth_filter = cgit_new_filter(value, AUTH);
else if (!strcmp(name, "embedded"))
@@ -1165,6 +1172,8 @@ void cgit_repo_config(struct cgit_repo *repo, const char *name, const char *valu
repo->enable_remote_branches = atoi(value);
else if (!strcmp(name, "enable-subject-links"))
repo->enable_subject_links = atoi(value);
+ else if (!strcmp(name, "enable-trailers"))
+ repo->enable_trailers = atoi(value);
else if (!strcmp(name, "enable-html-serving"))
repo->enable_html_serving = atoi(value);
else if (!strcmp(name, "branch-sort")) {
@@ -1204,7 +1213,8 @@ void cgit_repo_config(struct cgit_repo *repo, const char *name, const char *valu
!strcmp(name, "about-filter") ||
!strcmp(name, "commit-filter") ||
!strcmp(name, "source-filter") ||
- !strcmp(name, "email-filter")
+ !strcmp(name, "email-filter") ||
+ !strcmp(name, "trailer-filter")
) {
if (!ctx.cfg.enable_filter_overrides)
fprintf(stderr, "[cgit] Ignoring repo %s: enable-filter-overrides is not set\n", name);
@@ -1214,8 +1224,10 @@ void cgit_repo_config(struct cgit_repo *repo, const char *name, const char *valu
repo->commit_filter = cgit_new_filter(value, COMMIT);
else if (!strcmp(name, "source-filter"))
repo->source_filter = cgit_new_filter(value, SOURCE);
- else
+ else if (!strcmp(name, "email-filter"))
repo->email_filter = cgit_new_filter(value, EMAIL);
+ else
+ repo->trailer_filter = cgit_new_filter(value, TRAILER);
} else
fprintf(stderr, "[cgit] Unknown repo config key: %s\n", name);
}