use oid_to_hex_r() for converting struct object_id hashes to hex strings
Patch generated by Coccinelle and contrib/coccinelle/object_id.cocci. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
4e59582ff7
commit
2490574d15
@ -22,7 +22,7 @@ static int merge_entry(int pos, const char *path)
|
||||
if (strcmp(ce->name, path))
|
||||
break;
|
||||
found++;
|
||||
sha1_to_hex_r(hexbuf[stage], ce->oid.hash);
|
||||
oid_to_hex_r(hexbuf[stage], &ce->oid);
|
||||
xsnprintf(ownbuf[stage], sizeof(ownbuf[stage]), "%o", ce->ce_mode);
|
||||
arguments[stage] = hexbuf[stage];
|
||||
arguments[stage + 4] = ownbuf[stage];
|
||||
|
Reference in New Issue
Block a user