mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

notes-merge: switch to use the_hash_algo

Browse Source 
Switch from using GIT_SHA1_HEXSZ to GIT_MAX_HEXSZ and the_hash_algo so
that the code works with any hash algorithm.

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-02-19 00:05:00 +00:00
committed by Junio C Hamano
parent db1ba2a230
commit 2235030755
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
notes-merge.c
View File

@ -29,14 +29,14 @@ void init_notes_merge_options(struct repository *r,
static int path_to_oid(const char *path, struct object_id *oid) static int path_to_oid(const char *path, struct object_id *oid)
{ {
char hex_oid[GIT_SHA1_HEXSZ]; char hex_oid[GIT_MAX_HEXSZ];
int i = 0; int i = 0;
while (*path && i < GIT_SHA1_HEXSZ) { while (*path && i < the_hash_algo->hexsz) {
if (*path != '/') if (*path != '/')
hex_oid[i++] = *path; hex_oid[i++] = *path;
path++; path++;
} }
if (*path || i != GIT_SHA1_HEXSZ) if (*path || i != the_hash_algo->hexsz)
return -1; return -1;
return get_oid_hex(hex_oid, oid); return get_oid_hex(hex_oid, oid);
} }