From 43b1791ec601732ac31195df96781a848360a9ac Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 21 Sep 2021 13:03:01 +0300 Subject: chore(3p/git): Unvendor git and track patches instead This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b --- third_party/git/tag.c | 236 -------------------------------------------------- 1 file changed, 236 deletions(-) delete mode 100644 third_party/git/tag.c (limited to 'third_party/git/tag.c') diff --git a/third_party/git/tag.c b/third_party/git/tag.c deleted file mode 100644 index 1ed2684e45..0000000000 --- a/third_party/git/tag.c +++ /dev/null @@ -1,236 +0,0 @@ -#include "cache.h" -#include "tag.h" -#include "object-store.h" -#include "commit.h" -#include "tree.h" -#include "blob.h" -#include "alloc.h" -#include "gpg-interface.h" -#include "packfile.h" - -const char *tag_type = "tag"; - -static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags) -{ - struct signature_check sigc; - size_t payload_size; - int ret; - - memset(&sigc, 0, sizeof(sigc)); - - payload_size = parse_signature(buf, size); - - if (size == payload_size) { - if (flags & GPG_VERIFY_VERBOSE) - write_in_full(1, buf, payload_size); - return error("no signature found"); - } - - ret = check_signature(buf, payload_size, buf + payload_size, - size - payload_size, &sigc); - - if (!(flags & GPG_VERIFY_OMIT_STATUS)) - print_signature_buffer(&sigc, flags); - - signature_check_clear(&sigc); - return ret; -} - -int gpg_verify_tag(const struct object_id *oid, const char *name_to_report, - unsigned flags) -{ - enum object_type type; - char *buf; - unsigned long size; - int ret; - - type = oid_object_info(the_repository, oid, NULL); - if (type != OBJ_TAG) - return error("%s: cannot verify a non-tag object of type %s.", - name_to_report ? - name_to_report : - find_unique_abbrev(oid, DEFAULT_ABBREV), - type_name(type)); - - buf = read_object_file(oid, &type, &size); - if (!buf) - return error("%s: unable to read file.", - name_to_report ? - name_to_report : - find_unique_abbrev(oid, DEFAULT_ABBREV)); - - ret = run_gpg_verify(buf, size, flags); - - free(buf); - return ret; -} - -struct object *deref_tag(struct repository *r, struct object *o, const char *warn, int warnlen) -{ - struct object_id *last_oid = NULL; - while (o && o->type == OBJ_TAG) - if (((struct tag *)o)->tagged) { - last_oid = &((struct tag *)o)->tagged->oid; - o = parse_object(r, last_oid); - } else { - last_oid = NULL; - o = NULL; - } - if (!o && warn) { - if (last_oid && is_promisor_object(last_oid)) - return NULL; - if (!warnlen) - warnlen = strlen(warn); - error("missing object referenced by '%.*s'", warnlen, warn); - } - return o; -} - -struct object *deref_tag_noverify(struct object *o) -{ - while (o && o->type == OBJ_TAG) { - o = parse_object(the_repository, &o->oid); - if (o && o->type == OBJ_TAG && ((struct tag *)o)->tagged) - o = ((struct tag *)o)->tagged; - else - o = NULL; - } - return o; -} - -struct tag *lookup_tag(struct repository *r, const struct object_id *oid) -{ - struct object *obj = lookup_object(r, oid); - if (!obj) - return create_object(r, oid, alloc_tag_node(r)); - return object_as_type(obj, OBJ_TAG, 0); -} - -static timestamp_t parse_tag_date(const char *buf, const char *tail) -{ - const char *dateptr; - - while (buf < tail && *buf++ != '>') - /* nada */; - if (buf >= tail) - return 0; - dateptr = buf; - while (buf < tail && *buf++ != '\n') - /* nada */; - if (buf >= tail) - return 0; - /* dateptr < buf && buf[-1] == '\n', so parsing will stop at buf-1 */ - return parse_timestamp(dateptr, NULL, 10); -} - -void release_tag_memory(struct tag *t) -{ - free(t->tag); - t->tagged = NULL; - t->object.parsed = 0; - t->date = 0; -} - -int parse_tag_buffer(struct repository *r, struct tag *item, const void *data, unsigned long size) -{ - struct object_id oid; - char type[20]; - const char *bufptr = data; - const char *tail = bufptr + size; - const char *nl; - - if (item->object.parsed) - return 0; - - if (item->tag) { - /* - * Presumably left over from a previous failed parse; - * clear it out in preparation for re-parsing (we'll probably - * hit the same error, which lets us tell our current caller - * about the problem). - */ - FREE_AND_NULL(item->tag); - } - - if (size < the_hash_algo->hexsz + 24) - return -1; - if (memcmp("object ", bufptr, 7) || parse_oid_hex(bufptr + 7, &oid, &bufptr) || *bufptr++ != '\n') - return -1; - - if (!starts_with(bufptr, "type ")) - return -1; - bufptr += 5; - nl = memchr(bufptr, '\n', tail - bufptr); - if (!nl || sizeof(type) <= (nl - bufptr)) - return -1; - memcpy(type, bufptr, nl - bufptr); - type[nl - bufptr] = '\0'; - bufptr = nl + 1; - - if (!strcmp(type, blob_type)) { - item->tagged = (struct object *)lookup_blob(r, &oid); - } else if (!strcmp(type, tree_type)) { - item->tagged = (struct object *)lookup_tree(r, &oid); - } else if (!strcmp(type, commit_type)) { - item->tagged = (struct object *)lookup_commit(r, &oid); - } else if (!strcmp(type, tag_type)) { - item->tagged = (struct object *)lookup_tag(r, &oid); - } else { - return error("unknown tag type '%s' in %s", - type, oid_to_hex(&item->object.oid)); - } - - if (!item->tagged) - return error("bad tag pointer to %s in %s", - oid_to_hex(&oid), - oid_to_hex(&item->object.oid)); - - if (bufptr + 4 < tail && starts_with(bufptr, "tag ")) - ; /* good */ - else - return -1; - bufptr += 4; - nl = memchr(bufptr, '\n', tail - bufptr); - if (!nl) - return -1; - item->tag = xmemdupz(bufptr, nl - bufptr); - bufptr = nl + 1; - - if (bufptr + 7 < tail && starts_with(bufptr, "tagger ")) - item->date = parse_tag_date(bufptr, tail); - else - item->date = 0; - - item->object.parsed = 1; - return 0; -} - -int parse_tag(struct tag *item) -{ - enum object_type type; - void *data; - unsigned long size; - int ret; - - if (item->object.parsed) - return 0; - data = read_object_file(&item->object.oid, &type, &size); - if (!data) - return error("Could not read %s", - oid_to_hex(&item->object.oid)); - if (type != OBJ_TAG) { - free(data); - return error("Object %s not a tag", - oid_to_hex(&item->object.oid)); - } - ret = parse_tag_buffer(the_repository, item, data, size); - free(data); - return ret; -} - -struct object_id *get_tagged_oid(struct tag *tag) -{ - if (!tag->tagged) - die("bad tag"); - return &tag->tagged->oid; -} -- cgit 1.4.1