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

merge(3p/git): Merge git upstream at v2.26.2

Browse source
This commit is contained in:
Vincent Ambo 2020-05-22 17:46:45 +01:00
commit 5229c9b232
1006 changed files with 149006 additions and 60819 deletions
Download patch file Download diff file Expand all files Collapse all files

10
third_party/git/rerere.c vendored
View file

@ -52,7 +52,7 @@ static void free_rerere_id(struct string_list_item *item)
static const char *rerere_id_hex(const struct rerere_id *id)
{
return sha1_to_hex(id->collection->hash);
return hash_to_hex(id->collection->hash);
}
static void fit_variant(struct rerere_dir *rr_dir, int variant)
@ -115,7 +115,7 @@ static int is_rr_file(const char *name, const char *filename, int *variant)
static void scan_rerere_dir(struct rerere_dir *rr_dir)
{
struct dirent *de;
DIR *dir = opendir(git_path("rr-cache/%s", sha1_to_hex(rr_dir->hash)));
DIR *dir = opendir(git_path("rr-cache/%s", hash_to_hex(rr_dir->hash)));
if (!dir)
return;
@ -186,9 +186,9 @@ static struct rerere_id *new_rerere_id_hex(char *hex)
return id;
}
static struct rerere_id *new_rerere_id(unsigned char *sha1)
static struct rerere_id *new_rerere_id(unsigned char *hash)
{
return new_rerere_id_hex(sha1_to_hex(sha1));
return new_rerere_id_hex(hash_to_hex(hash));
}
/*
@ -431,7 +431,7 @@ static int handle_conflict(struct strbuf *out, struct rerere_io *io,
* and NUL concatenated together.
*
* Return 1 if conflict hunks are found, 0 if there are no conflict
* hunks and -1 if an error occured.
* hunks and -1 if an error occurred.
*/
static int handle_path(unsigned char *hash, struct rerere_io *io, int marker_size)
{