Update git to v1.7.9.7

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index a97ed69653b36d696c0fd564bfbc4be55f99f2b0..d6153154211ef03883ab0166aa61cf1327dba309 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -172,6 +172,8 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.enable_http_clone = atoi(value);
        else if (!strcmp(name, "enable-index-links"))
                ctx.cfg.enable_index_links = atoi(value);
+       else if (!strcmp(name, "enable-index-owner"))
+               ctx.cfg.enable_index_owner = atoi(value);
        else if (!strcmp(name, "enable-commit-graph"))
                ctx.cfg.enable_commit_graph = atoi(value);
        else if (!strcmp(name, "enable-log-filecount"))
@@ -354,6 +356,7 @@ static void prepare_context(struct cgit_context *ctx)
        ctx->cfg.logo = "/cgit.png";
        ctx->cfg.local_time = 0;
        ctx->cfg.enable_http_clone = 1;
+       ctx->cfg.enable_index_owner = 1;
        ctx->cfg.enable_tree_linenumbers = 1;
        ctx->cfg.enable_git_config = 0;
        ctx->cfg.max_repo_count = 50;
@@ -447,7 +450,7 @@ static char *guess_defbranch(const char *repo_path)
        const char *ref;
        unsigned char sha1[20];
 
-       ref = resolve_ref("HEAD", sha1, 0, NULL);
+       ref = resolve_ref_unsafe("HEAD", sha1, 0, NULL);
        if (!ref || prefixcmp(ref, "refs/heads/"))
                return "master";
        return xstrdup(ref + 11);