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

12
third_party/git/sha1-lookup.c vendored
View file

@ -50,7 +50,7 @@ static uint32_t take2(const unsigned char *sha1)
* The sha1 of element i (between 0 and nr - 1) should be returned
* by "fn(i, table)".
*/
int sha1_pos(const unsigned char *hash, void *table, size_t nr,
int sha1_pos(const unsigned char *sha1, void *table, size_t nr,
sha1_access_fn fn)
{
size_t hi = nr;
@ -63,14 +63,14 @@ int sha1_pos(const unsigned char *hash, void *table, size_t nr,
if (nr != 1) {
size_t lov, hiv, miv, ofs;
for (ofs = 0; ofs < the_hash_algo->rawsz - 2; ofs += 2) {
for (ofs = 0; ofs < 18; ofs += 2) {
lov = take2(fn(0, table) + ofs);
hiv = take2(fn(nr - 1, table) + ofs);
miv = take2(hash + ofs);
miv = take2(sha1 + ofs);
if (miv < lov)
return -1;
if (hiv < miv)
return index_pos_to_insert_pos(nr);
return -1 - nr;
if (lov != hiv) {
/*
* At this point miv could be equal
@ -88,7 +88,7 @@ int sha1_pos(const unsigned char *hash, void *table, size_t nr,
do {
int cmp;
cmp = hashcmp(fn(mi, table), hash);
cmp = hashcmp(fn(mi, table), sha1);
if (!cmp)
return mi;
if (cmp > 0)
@ -97,7 +97,7 @@ int sha1_pos(const unsigned char *hash, void *table, size_t nr,
lo = mi + 1;
mi = lo + (hi - lo) / 2;
} while (lo < hi);
return index_pos_to_insert_pos(lo);
return -lo-1;
}
int bsearch_hash(const unsigned char *sha1, const uint32_t *fanout_nbo,