Diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/cgit.c | 10 | |
| -rw-r--r-- | source/cgit.h | 4 | |
| -rw-r--r-- | source/shared.c | 2 | |
| -rw-r--r-- | source/ui-commit.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/source/cgit.c b/source/cgit.c index 8601dd0..5806293 100644 --- a/source/cgit.c +++ b/source/cgit.c @@ -270,7 +270,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-commit-trailers=%d\n", repo->enable_commit_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"); @@ -576,8 +576,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-commit-trailers")) + ctx.cfg.enable_commit_trailers = atoi(value); else if (!strcmp(name, "enable-html-serving")) ctx.cfg.enable_html_serving = atoi(value); else if (!strcmp(name, "enable-tree-linenumbers")) @@ -1251,8 +1251,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-commit-trailers")) + repo->enable_commit_trailers = atoi(value); else if (!strcmp(name, "enable-html-serving")) repo->enable_html_serving = atoi(value); else if (!strcmp(name, "branch-sort")) { diff --git a/source/cgit.h b/source/cgit.h index 163cd4d..3d3b154 100644 --- a/source/cgit.h +++ b/source/cgit.h @@ -99,7 +99,7 @@ struct cgit_repo { int enable_mailmap; int enable_remote_branches; int enable_subject_links; - int enable_trailers; + int enable_commit_trailers; int enable_html_serving; int max_stats; int branch_sort; @@ -241,7 +241,7 @@ struct cgit_config { int enable_relative_dates; int enable_remote_branches; int enable_subject_links; - int enable_trailers; + int enable_commit_trailers; int enable_html_serving; int enable_tree_linenumbers; int enable_tree_group_dirs; diff --git a/source/shared.c b/source/shared.c index a1d1597..1b610a0 100644 --- a/source/shared.c +++ b/source/shared.c @@ -247,7 +247,7 @@ struct cgit_repo *cgit_add_repo(const char *url) repo->enable_mailmap = ctx.cfg.enable_mailmap; repo->enable_remote_branches = ctx.cfg.enable_remote_branches; repo->enable_subject_links = ctx.cfg.enable_subject_links; - repo->enable_trailers = ctx.cfg.enable_trailers; + repo->enable_commit_trailers = ctx.cfg.enable_commit_trailers; repo->enable_html_serving = ctx.cfg.enable_html_serving; repo->max_stats = ctx.cfg.max_stats; repo->branch_sort = ctx.cfg.branch_sort; diff --git a/source/ui-commit.c b/source/ui-commit.c index 1ac96aa..846dd5d 100644 --- a/source/ui-commit.c +++ b/source/ui-commit.c @@ -208,7 +208,7 @@ static void print_message(struct commitinfo *info) size_t prefix, start, end; char *body = NULL; - if (ctx.repo->enable_trailers) { + if (ctx.repo->enable_commit_trailers) { strbuf_addf(&full, "%s\n\n%s", info->subject, info->msg); prefix = full.len - strlen(info->msg); opts.no_divider = 1; |