author | Lars Hjemli <hjemli@gmail.com> | 2009-11-07 18:10:58 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-11-07 18:10:58 (UTC) |
commit | 41934a3222cd3e5a5f214e4275929519c70d311d (patch) (side-by-side diff) | |
tree | f938c5a2a595ce0b33bab53cd7d6872bfb8d62c5 | |
parent | e633ccf714eb423c4522924c3b611dac2e176c5e (diff) | |
download | cgit-41934a3222cd3e5a5f214e4275929519c70d311d.zip cgit-41934a3222cd3e5a5f214e4275929519c70d311d.tar.gz cgit-41934a3222cd3e5a5f214e4275929519c70d311d.tar.bz2 |
Add support for remote branches
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 4 | ||||
-rw-r--r-- | cgit.h | 2 | ||||
-rw-r--r-- | cgitrc.5.txt | 9 | ||||
-rw-r--r-- | shared.c | 1 | ||||
-rw-r--r-- | ui-refs.c | 2 |
5 files changed, 18 insertions, 0 deletions
@@ -62,2 +62,4 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); + else if (!strcmp(name, "enable-remote-branches")) + repo->enable_remote_branches = atoi(value); else if (!strcmp(name, "max-stats")) @@ -139,2 +141,4 @@ void config_cb(const char *name, const char *value) ctx.cfg.enable_log_linecount = atoi(value); + else if (!strcmp(name, "enable-remote-branches")) + ctx.cfg.enable_remote_branches = atoi(value); else if (!strcmp(name, "enable-tree-linenumbers")) @@ -74,2 +74,3 @@ struct cgit_repo { int enable_log_linecount; + int enable_remote_branches; int max_stats; @@ -180,2 +181,3 @@ struct cgit_config { int enable_log_linecount; + int enable_remote_branches; int enable_tree_linenumbers; diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 0c13485..0bb429a 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -112,2 +112,7 @@ enable-log-linecount:: +enable-remote-branches:: + Flag which, when set to "1", will make cgit display remote branches + in the summary and refs views. Default value: "0". See also: + "repo.enable-remote-branches". + enable-tree-linenumbers:: @@ -306,2 +311,6 @@ repo.enable-log-linecount:: +repo.enable-remote-branches:: + Flag which, when set to "1", will make cgit display remote branches + in the summary and refs views. Default value: <enable-remote-branches>. + repo.max-stats:: @@ -61,2 +61,3 @@ struct cgit_repo *cgit_add_repo(const char *url) ret->enable_log_linecount = ctx.cfg.enable_log_linecount; + ret->enable_remote_branches = ctx.cfg.enable_remote_branches; ret->max_stats = ctx.cfg.max_stats; @@ -189,2 +189,4 @@ void cgit_print_branches(int maxcount) for_each_branch_ref(cgit_refs_cb, &list); + if (ctx.repo->enable_remote_branches) + for_each_remote_ref(cgit_refs_cb, &list); |