diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-08-04 19:52:30 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-08-04 19:52:30 +0200 |
| commit | 3365e2675e5ac95e0a44665966e8cfbb9433456e (patch) | |
| tree | 634776d7ea6a0145f95ae84e1b9f1c651387a37e /rerere.c | |
| parent | Merge branch 'la/doc-choose-starting-point' (diff) | |
| parent | hex: retire get_sha1_hex() (diff) | |
| download | git-3365e2675e5ac95e0a44665966e8cfbb9433456e.tar.xz git-3365e2675e5ac95e0a44665966e8cfbb9433456e.zip | |
Merge branch 'jc/retire-get-sha1-hex'
The implementation of "get_sha1_hex()" that reads a hexadecimal
string that spells a full object name has been extended to cope
with any hash function used in the repository, but the "sha1" in
its name survived. Rename it to get_hash_hex(), a name that is
more consistent within its friends like get_hash_hex_algop().
* jc/retire-get-sha1-hex:
hex: retire get_sha1_hex()
Diffstat (limited to 'rerere.c')
| -rw-r--r-- | rerere.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -204,7 +204,7 @@ static void read_rr(struct repository *r, struct string_list *rr) const unsigned hexsz = the_hash_algo->hexsz; /* There has to be the hash, tab, path and then NUL */ - if (buf.len < hexsz + 2 || get_sha1_hex(buf.buf, hash)) + if (buf.len < hexsz + 2 || get_hash_hex(buf.buf, hash)) die(_("corrupt MERGE_RR")); if (buf.buf[hexsz] != '.') { |