5 files changed, 18 insertions, 0 deletions

diff --git a/cgit.c b/cgit.c
index 4f68a4b..e46c00a 100644
--- a/cgit.c
+++ b/cgit.c
@@ -61,4 +61,6 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
         else if (!strcmp(name, "enable-log-linecount"))
                 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"))
                 repo->max_stats = cgit_find_stats_period(value, NULL);
@@ -138,4 +140,6 @@ void config_cb(const char *name, const char *value)
         else if (!strcmp(name, "enable-log-linecount"))
                 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"))
                 ctx.cfg.enable_tree_linenumbers = atoi(value);
diff --git a/cgit.h b/cgit.h
index 5941ec0..cd4af72 100644
--- a/cgit.h
+++ b/cgit.h
@@ -73,4 +73,5 @@ struct cgit_repo {
         int enable_log_filecount;
         int enable_log_linecount;
+        int enable_remote_branches;
         int max_stats;
         time_t mtime;
@@ -180,4 +181,5 @@ struct cgit_config {
         int enable_log_filecount;
         int enable_log_linecount;
+        int enable_remote_branches;
         int enable_tree_linenumbers;
         int local_time;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 70e4c78..d74d9e7 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -111,4 +111,9 @@ enable-log-linecount::
         value: "0".
 
+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::
         Flag which, when set to "1", will make cgit generate linenumber links
@@ -313,4 +318,8 @@ repo.enable-log-linecount::
         `enable-log-linecount'. Default value: none.
 
+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::
         Override the default maximum statistics period. Valid values are equal
diff --git a/shared.c b/shared.c
index 9362d21..5f46793 100644
--- a/shared.c
+++ b/shared.c
@@ -60,4 +60,5 @@ struct cgit_repo *cgit_add_repo(const char *url)
         ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
         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;
         ret->module_link = ctx.cfg.module_link;
diff --git a/ui-refs.c b/ui-refs.c
index 33d9bec..98738db 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -188,4 +188,6 @@ void cgit_print_branches(int maxcount)
         list.alloc = list.count = 0;
         for_each_branch_ref(cgit_refs_cb, &list);
+        if (ctx.repo->enable_remote_branches)
+                for_each_remote_ref(cgit_refs_cb, &list);
 
         if (maxcount == 0 || maxcount > list.count)