sha1_file: convert sha1_object_info* to object_id
Convert sha1_object_info and sha1_object_info_extended to take pointers to struct object_id and rename them to use "oid" instead of "sha1" in their names. Update the declaration and definition and apply the following semantic patch, plus the standard object_id transforms: @@ expression E1, E2; @@ - sha1_object_info(E1.hash, E2) + oid_object_info(&E1, E2) @@ expression E1, E2; @@ - sha1_object_info(E1->hash, E2) + oid_object_info(E1, E2) @@ expression E1, E2, E3; @@ - sha1_object_info_extended(E1.hash, E2, E3) + oid_object_info_extended(&E1, E2, E3) @@ expression E1, E2, E3; @@ - sha1_object_info_extended(E1->hash, E2, E3) + oid_object_info_extended(E1, E2, E3) Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
7984f23833
commit
abef9020e3
2
object.c
2
object.c
@ -254,7 +254,7 @@ struct object *parse_object(const struct object_id *oid)
|
||||
|
||||
if ((obj && obj->type == OBJ_BLOB && has_object_file(oid)) ||
|
||||
(!obj && has_object_file(oid) &&
|
||||
sha1_object_info(oid->hash, NULL) == OBJ_BLOB)) {
|
||||
oid_object_info(oid, NULL) == OBJ_BLOB)) {
|
||||
struct object_id reploid;
|
||||
hashcpy(reploid.hash, repl);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user