From 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 26 May 2020 00:06:52 +0100 Subject: revert(3p/git): Revert merge of git upstream at v2.26.2 This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3. --- third_party/git/patch-ids.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'third_party/git/patch-ids.c') diff --git a/third_party/git/patch-ids.c b/third_party/git/patch-ids.c index 12aa6d494b..e8c150d0c9 100644 --- a/third_party/git/patch-ids.c +++ b/third_party/git/patch-ids.c @@ -36,16 +36,14 @@ int commit_patch_id(struct commit *commit, struct diff_options *options, * any significance; only that it is non-zero matters. */ static int patch_id_neq(const void *cmpfn_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const void *entry, + const void *entry_or_key, const void *unused_keydata) { /* NEEDSWORK: const correctness? */ struct diff_options *opt = (void *)cmpfn_data; - struct patch_id *a, *b; - - a = container_of(eptr, struct patch_id, ent); - b = container_of(entry_or_key, struct patch_id, ent); + struct patch_id *a = (void *)entry; + struct patch_id *b = (void *)entry_or_key; if (is_null_oid(&a->patch_id) && commit_patch_id(a->commit, opt, &a->patch_id, 0, 0)) @@ -71,7 +69,7 @@ int init_patch_ids(struct repository *r, struct patch_ids *ids) int free_patch_ids(struct patch_ids *ids) { - hashmap_free_entries(&ids->patches, struct patch_id, ent); + hashmap_free(&ids->patches, 1); return 0; } @@ -85,7 +83,7 @@ static int init_patch_id_entry(struct patch_id *patch, if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1, 0)) return -1; - hashmap_entry_init(&patch->ent, oidhash(&header_only_patch_id)); + hashmap_entry_init(patch, oidhash(&header_only_patch_id)); return 0; } @@ -101,7 +99,7 @@ struct patch_id *has_commit_patch_id(struct commit *commit, if (init_patch_id_entry(&patch, commit, ids)) return NULL; - return hashmap_get_entry(&ids->patches, &patch, ent, NULL); + return hashmap_get(&ids->patches, &patch, NULL); } struct patch_id *add_commit_patch_id(struct commit *commit, @@ -118,6 +116,6 @@ struct patch_id *add_commit_patch_id(struct commit *commit, return NULL; } - hashmap_add(&ids->patches, &key->ent); + hashmap_add(&ids->patches, key); return key; } -- cgit 1.4.1