X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/17838ec6304198811df97402f11c185f8f0e10bd..044e2d26da4f8b4f9ff25e4a729ab4e393073b5e:/ui-log.c diff --git a/ui-log.c b/ui-log.c index 657ff3c..8028b27 100644 --- a/ui-log.c +++ b/ui-log.c @@ -12,7 +12,7 @@ #include "ui-shared.h" #include "argv-array.h" -int files, add_lines, rem_lines; +static int files, add_lines, rem_lines; /* * The list of available column colors in the commit graph. @@ -71,11 +71,11 @@ void show_commit_decorations(struct commit *commit) } else if (starts_with(deco->name, "tag: refs/tags/")) { strncpy(buf, deco->name + 15, sizeof(buf) - 1); - cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); + cgit_tag_link(buf, NULL, "tag-deco", buf); } else if (starts_with(deco->name, "refs/tags/")) { strncpy(buf, deco->name + 10, sizeof(buf) - 1); - cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); + cgit_tag_link(buf, NULL, "tag-deco", buf); } else if (starts_with(deco->name, "refs/remotes/")) { if (!ctx.repo->enable_remote_branches) @@ -249,11 +249,11 @@ static void print_commit(struct commit *commit, struct rev_info *revs) static const char *disambiguate_ref(const char *ref, int *must_free_result) { - unsigned char sha1[20]; + struct object_id oid; struct strbuf longref = STRBUF_INIT; strbuf_addf(&longref, "refs/heads/%s", ref); - if (get_sha1(longref.buf, sha1) == 0) { + if (get_sha1(longref.buf, oid.hash) == 0) { *must_free_result = 1; return strbuf_detach(&longref, NULL); }