ui-blame: Distinguish hashes column from lines column

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 1dae4b8c39cf9e915f1375400c74ae392d1515e8..a3702c26a6781d1cbeeb888da8f9390ff966a61c 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -167,6 +167,8 @@ static void config_cb(const char *name, const char *value)
                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-blame"))
+               ctx.cfg.enable_blame = atoi(value);
        else if (!strcmp(name, "enable-commit-graph"))
                ctx.cfg.enable_commit_graph = atoi(value);
        else if (!strcmp(name, "enable-log-filecount"))
@@ -476,7 +478,7 @@ static char *guess_defbranch(void)
        const char *ref, *refname;
        struct object_id oid;
 
-       ref = resolve_ref_unsafe("HEAD", 0, oid.hash, NULL);
+       ref = resolve_ref_unsafe("HEAD", 0, &oid, NULL);
        if (!ref || !skip_prefix(ref, "refs/heads/", &refname))
                return "master";
        return xstrdup(refname);