974e4a85e3
There are some situations in which we want to store an object ID into struct object_id without the_hash_algo necessarily being set correctly. One such case is when cloning a repository, where we must read refs from the remote side without having a repository from which to read the preferred algorithm. In this cases, we may have the_hash_algo set to SHA-1, which is the default, but read refs into struct object_id that are SHA-256. When copying these values, we will want to copy them completely, not just the first 20 bytes. Consequently, make sure that oidcpy copies the maximum number of bytes at all times, regardless of the setting of the_hash_algo. Since oidcpy and hashcpy are no longer functionally identical, remove the Cocinelle object_id transformations that convert from one into the other. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
120 lines
1.7 KiB
Plaintext
120 lines
1.7 KiB
Plaintext
@@
|
|
struct object_id OID;
|
|
@@
|
|
- is_null_sha1(OID.hash)
|
|
+ is_null_oid(&OID)
|
|
|
|
@@
|
|
struct object_id *OIDPTR;
|
|
@@
|
|
- is_null_sha1(OIDPTR->hash)
|
|
+ is_null_oid(OIDPTR)
|
|
|
|
@@
|
|
struct object_id OID;
|
|
@@
|
|
- sha1_to_hex(OID.hash)
|
|
+ oid_to_hex(&OID)
|
|
|
|
@@
|
|
identifier f != oid_to_hex;
|
|
struct object_id *OIDPTR;
|
|
@@
|
|
f(...) {<...
|
|
- sha1_to_hex(OIDPTR->hash)
|
|
+ oid_to_hex(OIDPTR)
|
|
...>}
|
|
|
|
@@
|
|
expression E;
|
|
struct object_id OID;
|
|
@@
|
|
- sha1_to_hex_r(E, OID.hash)
|
|
+ oid_to_hex_r(E, &OID)
|
|
|
|
@@
|
|
identifier f != oid_to_hex_r;
|
|
expression E;
|
|
struct object_id *OIDPTR;
|
|
@@
|
|
f(...) {<...
|
|
- sha1_to_hex_r(E, OIDPTR->hash)
|
|
+ oid_to_hex_r(E, OIDPTR)
|
|
...>}
|
|
|
|
@@
|
|
struct object_id OID;
|
|
@@
|
|
- hashclr(OID.hash)
|
|
+ oidclr(&OID)
|
|
|
|
@@
|
|
identifier f != oidclr;
|
|
struct object_id *OIDPTR;
|
|
@@
|
|
f(...) {<...
|
|
- hashclr(OIDPTR->hash)
|
|
+ oidclr(OIDPTR)
|
|
...>}
|
|
|
|
@@
|
|
struct object_id OID1, OID2;
|
|
@@
|
|
- hashcmp(OID1.hash, OID2.hash)
|
|
+ oidcmp(&OID1, &OID2)
|
|
|
|
@@
|
|
identifier f != oidcmp;
|
|
struct object_id *OIDPTR1, OIDPTR2;
|
|
@@
|
|
f(...) {<...
|
|
- hashcmp(OIDPTR1->hash, OIDPTR2->hash)
|
|
+ oidcmp(OIDPTR1, OIDPTR2)
|
|
...>}
|
|
|
|
@@
|
|
struct object_id *OIDPTR;
|
|
struct object_id OID;
|
|
@@
|
|
- hashcmp(OIDPTR->hash, OID.hash)
|
|
+ oidcmp(OIDPTR, &OID)
|
|
|
|
@@
|
|
struct object_id *OIDPTR;
|
|
struct object_id OID;
|
|
@@
|
|
- hashcmp(OID.hash, OIDPTR->hash)
|
|
+ oidcmp(&OID, OIDPTR)
|
|
|
|
@@
|
|
struct object_id *OIDPTR1;
|
|
struct object_id *OIDPTR2;
|
|
@@
|
|
- oidcmp(OIDPTR1, OIDPTR2) == 0
|
|
+ oideq(OIDPTR1, OIDPTR2)
|
|
|
|
@@
|
|
identifier f != hasheq;
|
|
expression E1, E2;
|
|
@@
|
|
f(...) {<...
|
|
- hashcmp(E1, E2) == 0
|
|
+ hasheq(E1, E2)
|
|
...>}
|
|
|
|
@@
|
|
struct object_id *OIDPTR1;
|
|
struct object_id *OIDPTR2;
|
|
@@
|
|
- oidcmp(OIDPTR1, OIDPTR2) != 0
|
|
+ !oideq(OIDPTR1, OIDPTR2)
|
|
|
|
@@
|
|
identifier f != hasheq;
|
|
expression E1, E2;
|
|
@@
|
|
f(...) {<...
|
|
- hashcmp(E1, E2) != 0
|
|
+ !hasheq(E1, E2)
|
|
...>}
|