diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2019-08-18 20:04:25 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-08-19 15:04:59 -0700 |
| commit | 3f34d70d4029c420d0db82fc39e77da4470eb3cc (patch) | |
| tree | fe49b9bc7e662434a21ed5a208da184455de0ace | |
| parent | builtin/receive-pack: replace sha1_to_hex (diff) | |
| download | tgif-3f34d70d4029c420d0db82fc39e77da4470eb3cc.tar.xz | |
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>
| -rw-r--r-- | rerere.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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)); } /* |