git: update to v2.5.0

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index c16ed8c4885402970e535e1181a59fdd30d64382..ed026142a4fce1f9c9f6d94a094a21ec8f9ae87d 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -82,6 +82,10 @@ static void repo_config(struct cgit_repo *repo, const char *name, const char *va
                repo->logo = xstrdup(value);
        else if (!strcmp(name, "logo-link") && value != NULL)
                repo->logo_link = xstrdup(value);
+       else if (!strcmp(name, "hide"))
+               repo->hide = atoi(value);
+       else if (!strcmp(name, "ignore"))
+               repo->ignore = atoi(value);
        else if (ctx.cfg.enable_filter_overrides) {
                if (!strcmp(name, "about-filter"))
                        repo->about_filter = cgit_new_filter(value, ABOUT);
@@ -93,10 +97,6 @@ static void repo_config(struct cgit_repo *repo, const char *name, const char *va
                        repo->email_filter = cgit_new_filter(value, EMAIL);
                else if (!strcmp(name, "owner-filter"))
                        repo->owner_filter = cgit_new_filter(value, OWNER);
-       } else if (!strcmp(name, "hide")) {
-               repo->hide = atoi(value);
-       } else if (!strcmp(name, "ignore")) {
-               repo->ignore = atoi(value);
        }
 }
 
@@ -421,7 +421,7 @@ struct refmatch {
        int match;
 };
 
-static int find_current_ref(const char *refname, const unsigned char *sha1,
+static int find_current_ref(const char *refname, const struct object_id *oid,
                            int flags, void *cb_data)
 {
        struct refmatch *info;
@@ -599,6 +599,7 @@ static int prepare_repo_cmd(void)
                cgit_print_error("Repository seems to be empty");
                if (!strcmp(ctx.qry.page, "summary")) {
                        html("<table class='list'><tr class='nohover'><td>&nbsp;</td></tr><tr class='nohover'><th class='left'>Clone</th></tr>\n");
+                       cgit_prepare_repo_env(ctx.repo);
                        cgit_add_clone_urls(print_no_repo_clone_urls);
                        html("</table>\n");
                }