rerere: replace sha1_to_hex
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>
brian m. carlson committed
Aug 18, 2019 at 20:04 UTC
3f34d70d4029c420d0db82fc39e77da4470eb3cc
1 file changed
+4
-4
rerere.c
+4
-4
@@ -52,7 +52,7 @@ static void free_rerere_id(struct string_list_item *item)
52
53
static const char *rerere_id_hex(const struct rerere_id *id)
54
{
55
- return sha1_to_hex(id->collection->hash);
55
+ return hash_to_hex(id->collection->hash);
56
}
57
58
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)
115
static void scan_rerere_dir(struct rerere_dir *rr_dir)
116
{
117
struct dirent *de;
118
- DIR *dir = opendir(git_path("rr-cache/%s", sha1_to_hex(rr_dir->hash)));
118
+ DIR *dir = opendir(git_path("rr-cache/%s", hash_to_hex(rr_dir->hash)));
119
120
if (!dir)
121
return;
@@ -186,9 +186,9 @@ static struct rerere_id *new_rerere_id_hex(char *hex)
186
return id;
187
}
188
189
-static struct rerere_id *new_rerere_id(unsigned char *sha1)
189
+static struct rerere_id *new_rerere_id(unsigned char *hash)
190
{
191
- return new_rerere_id_hex(sha1_to_hex(sha1));
191
+ return new_rerere_id_hex(hash_to_hex(hash));
192
}
193
194
/*