X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/495e39677326284ea13b2f6d76195d6800c2a450..dc3ac3f76077c5d612d42e8beb4878e43acfc58a:/ui-summary.c?ds=inline diff --git a/ui-summary.c b/ui-summary.c index 3410e1a..e7158cc 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -33,7 +33,7 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, html_txt(info->author); html(""); url = cgit_pageurl(cgit_query_repo, "commit", - fmt("id=%s", sha1_to_hex(sha1))); + fmt("h=%s", sha1_to_hex(sha1))); html_link_open(url, NULL, NULL); html_ntxt(cgit_max_msg_len, info->subject); html_link_close(); @@ -52,17 +52,21 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, static void cgit_print_object_ref(struct object *obj) { - char *page, *url; + char *page, *arg, *url; - if (obj->type == OBJ_COMMIT) + if (obj->type == OBJ_COMMIT) { page = "commit"; - else if (obj->type == OBJ_TREE) + arg = "h"; + } else if (obj->type == OBJ_TREE) { page = "tree"; - else + arg = "id"; + } else { page = "view"; + arg = "id"; + } url = cgit_pageurl(cgit_query_repo, page, - fmt("id=%s", sha1_to_hex(obj->sha1))); + fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); html_link_open(url, NULL, NULL); htmlf("%s %s", typename(obj->type), sha1_to_hex(obj->sha1)); @@ -130,6 +134,7 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1, struct taginfo *info; struct object *obj; char buf[256], *url; + unsigned char fileid[20]; if (prefixcmp(refname, "refs/archives")) return 0; @@ -141,9 +146,11 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1, tag = lookup_tag(sha1); if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) return 0; - hashcpy(sha1, tag->tagged->sha1); + hashcpy(fileid, tag->tagged->sha1); } else if (obj->type != OBJ_BLOB) { return 0; + } else { + hashcpy(fileid, sha1); } if (!header) { html(""); @@ -152,7 +159,7 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1, } html("
"); url = cgit_pageurl(cgit_query_repo, "blob", - fmt("id=%s&path=%s", sha1_to_hex(sha1), + fmt("id=%s&path=%s", sha1_to_hex(fileid), buf)); html_link_open(url, NULL, NULL); html_txt(buf);