undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rerere: replace sha1_to_hex

Browse Source 
Replace the uses of sha1_to_hex in this function with hash_to_hex to
allow the use of SHA-256 as well.  Rename a variable since it is no
longer limited to SHA-1.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson 2019-08-18 20:04:25 +00:00 committed by Junio C Hamano
parent fc06be3b7f
commit 3f34d70d40
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rerere.c
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) 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) 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) static void scan_rerere_dir(struct rerere_dir *rr_dir)
{ {
struct dirent *de; 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) if (!dir)
return; return;
@ -186,9 +186,9 @@ static struct rerere_id *new_rerere_id_hex(char *hex)
return id; 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));
} }
/* /*