git: update to v2.30.1

[ps-cgit] / ui-blame.c

diff --git a/ui-blame.c b/ui-blame.c
index c3662bb7c4efb54d97d96d3e396e91be1cf2437c..ec1d8888254a7b0eaad88ae44c9fbf2058d0422f 100644 (file)
--- a/ui-blame.c
+++ b/ui-blame.c
@@ -48,7 +48,7 @@ static void emit_blame_entry_hash(struct blame_entry *ent)
        unsigned long line = 0;
 
        char *detail = emit_suspect_detail(suspect);
-       html("<span class='sha1'>");
+       html("<span class='oid'>");
        cgit_commit_link(find_unique_abbrev(oid, DEFAULT_ABBREV), detail,
                         NULL, ctx.qry.head, oid_to_hex(oid), suspect->path);
        html("</span>");
@@ -132,7 +132,8 @@ static void print_object(const struct object_id *oid, const char *path,
        init_scoreboard(&sb);
        sb.revs = &revs;
        sb.repo = the_repository;
-       setup_scoreboard(&sb, path, &o);
+       sb.path = path;
+       setup_scoreboard(&sb, &o);
        o->suspects = blame_entry_prepend(NULL, 0, sb.num_lines, o);
        prio_queue_put(&sb.commits, o->commit);
        blame_origin_decref(o);
@@ -256,7 +257,7 @@ static int basedir_len(const char *path)
 
 void cgit_print_blame(void)
 {
-       const char *rev = ctx.qry.sha1;
+       const char *rev = ctx.qry.oid;
        struct object_id oid;
        struct commit *commit;
        struct pathspec_item path_items = {