maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert(3p/git): Revert merge of git upstream at v2.26.2

Browse source 
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232, reversing
changes made to f2b211131f.
This commit is contained in:
Vincent Ambo 2020-05-26 00:06:52 +01:00
parent 6f8fbf4aa4
commit 93ba78d6f4
1006 changed files with 60537 additions and 148724 deletions
Download patch file Download diff file Expand all files Collapse all files

20
third_party/git/oidmap.c vendored
View file

@ -2,18 +2,14 @@
#include "oidmap.h"
static int oidmap_neq(const void *hashmap_cmp_fn_data,
const struct hashmap_entry *e1,
const struct hashmap_entry *e2,
const void *entry, const void *entry_or_key,
const void *keydata)
{
const struct oidmap_entry *a, *b;
a = container_of(e1, const struct oidmap_entry, internal_entry);
b = container_of(e2, const struct oidmap_entry, internal_entry);
const struct oidmap_entry *entry_ = entry;
if (keydata)
return !oideq(&a->oid, (const struct object_id *) keydata);
return !oideq(&a->oid, &b->oid);
return !oideq(&entry_->oid, (const struct object_id *) keydata);
return !oideq(&entry_->oid,
&((const struct oidmap_entry *) entry_or_key)->oid);
}
void oidmap_init(struct oidmap *map, size_t initial_size)
@ -25,9 +21,7 @@ void oidmap_free(struct oidmap *map, int free_entries)
{
if (!map)
return;
/* TODO: make oidmap itself not depend on struct layouts */
hashmap_free_(&map->map, free_entries ? 0 : -1);
hashmap_free(&map->map, free_entries);
}
void *oidmap_get(const struct oidmap *map, const struct object_id *key)
@ -57,5 +51,5 @@ void *oidmap_put(struct oidmap *map, void *entry)
oidmap_init(map, 0);
hashmap_entry_init(&to_put->internal_entry, oidhash(&to_put->oid));
return hashmap_put(&map->map, &to_put->internal_entry);
return hashmap_put(&map->map, to_put);
}