From 8fb2f056961e577a039ae185d89ab8e2d2840b9e Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Sun, 4 Feb 2007 22:55:19 +0100 Subject: Add support for lightweight tags There is nothing bad about a tag that has no tag-object, but the old code didn't handle such tags correctly. Fix it. Signed-off-by: Lars Hjemli --- git.h | 4 ++++ ui-summary.c | 52 +++++++++++++++++++++++++++++++++------------------- 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/git.h b/git.h index 991eaa5..eca48d5 100644 --- a/git.h +++ b/git.h @@ -278,6 +278,10 @@ struct object { }; +/** Returns the object, having parsed it to find out what it is. **/ +struct object *parse_object(const unsigned char *sha1); + + /* * from git:tree.h */ diff --git a/ui-summary.c b/ui-summary.c index 5518d01..ff3ed4d 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -47,16 +47,42 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, return 0; } + +static void cgit_print_object_ref(struct object *obj) +{ + char *page, *url; + + if (obj->type == OBJ_COMMIT) + page = "commit"; + else if (obj->type == OBJ_TREE) + page = "tree"; + else + page = "view"; + + url = cgit_pageurl(cgit_query_repo, page, + fmt("id=%s", sha1_to_hex(obj->sha1))); + html_link_open(url, NULL, NULL); + htmlf("%s %s", type_names[obj->type], + sha1_to_hex(obj->sha1)); + html_link_close(); +} + static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1, int flags, void *cb_data) { struct tag *tag; struct taginfo *info; - char buf[256], *page, *url; - + struct object *obj; + char buf[256], *url; + strncpy(buf, refname, sizeof(buf)); - tag = lookup_tag(sha1); - if (tag && !parse_tag(tag) && (info = cgit_parse_tag(tag))){ + obj = parse_object(sha1); + if (!obj) + return 1; + if (obj->type == OBJ_TAG) { + tag = lookup_tag(sha1); + if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) + return 2; html(""); url = cgit_pageurl(cgit_query_repo, "view", fmt("id=%s", sha1_to_hex(sha1))); @@ -70,25 +96,13 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1, if (info->tagger) html(info->tagger); html(""); - if (tag->tagged->type == OBJ_COMMIT) - page = "commit"; - else if (tag->tagged->type == OBJ_TREE) - page = "tree"; - else - page = "view"; - - url = cgit_pageurl(cgit_query_repo, page, - fmt("id=%s", sha1_to_hex(tag->tagged->sha1))); - html_link_open(url, NULL, NULL); - htmlf("%s %s", type_names[tag->tagged->type], - sha1_to_hex(tag->tagged->sha1)); - html_link_close(); + cgit_print_object_ref(tag->tagged); html("\n"); } else { html(""); html_txt(buf); - html(""); - htmlf("*** bad ref %s ***", sha1_to_hex(sha1)); + html(""); + cgit_print_object_ref(obj); html("\n"); } return 0; -- cgit 1.4.1 ime.h (unfollow)
Commit message (Collapse)Author
2021-11-29Import LibreSSL 3.4.2June McEnroe
2021-10-14Import LibreSSL 3.4.1June McEnroe
2021-09-17Import LibreSSL 3.4.0June McEnroe
2021-08-24Import LibreSSL 3.3.4June McEnroe
2021-05-25Bump version to 3.3.3p1 3.3.3p1June McEnroe
2021-05-25build: Add scripts to EXTRA_DISTJune McEnroe
2021-05-25import: Add missing scripts/wrap-compiler-for-flag-checkJune McEnroe
2021-05-08Import LibreSSL 3.3.3June McEnroe
2021-04-18build: Remove added x509_verify.3 links 3.3.2June McEnroe
2021-04-18tls: Use EC_KEY_set_ex_dataJune McEnroe
2021-04-18Import LibreSSL 3.3.2June McEnroe
2021-03-05Bump version to 3.3.1p1 3.3.1p1June McEnroe
2021-03-05build: Add OpenSSL includes to libcompatJune McEnroe
Some compat sources (getentropy_linux.c for example) require OpenSSL. Reported by Robert Scheck.
2020-12-15Import LibreSSL 3.3.1June McEnroe
2020-11-24Import LibreSSL 3.3.0June McEnroe
2020-10-22Import LibreSSL 3.2.2June McEnroe
2020-09-29Import LibreSSL 3.2.1June McEnroe
2020-09-29import: Add m4/ax_add_fortify_source.m4June McEnroe
2020-08-05build: Add README.7 to EXTRA_DIST 3.2.0June McEnroe
2020-08-03doc: Indicate that only OpenSSL 1.1.1b and newer workJune McEnroe