t0110: Chain together using &&

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 8c9cfb5e87ad9343f21b6cc0b032575969e4b914..baad1c8696fdbd38cf1cd12744cf8c298da9e6dc 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -421,7 +421,7 @@ struct refmatch {
        int match;
 };
 
        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;
                            int flags, void *cb_data)
 {
        struct refmatch *info;


@@ -742,6 +742,9 @@ static void process_request(void)
        if (ctx.repo && prepare_repo_cmd())
                return;
 
        if (ctx.repo && prepare_repo_cmd())
                return;
 

+       if (cmd->pre)
+               cmd->pre();
+

        if (cmd->want_layout) {
                cgit_print_http_headers();
                cgit_print_docstart();
        if (cmd->want_layout) {
                cgit_print_http_headers();
                cgit_print_docstart();