write_packed_entry(): take `object_id` arguments
Change `write_packed_entry()` to take `struct object_id *` rather than `unsigned char *` arguments. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty committed
Nov 5, 2017 at 09:42 UTC
417018826285140f9e948649ff9cf75a193075d2
1 file changed
+8
-8
refs/packed-backend.c
+8
-8
@@ -961,11 +961,11 @@ static struct ref_iterator *packed_ref_iterator_begin(
961
* by the failing call to `fprintf()`.
962
*/
963
static int write_packed_entry(FILE *fh, const char *refname,
964
- const unsigned char *sha1,
965
- const unsigned char *peeled)
964
+ const struct object_id *oid,
965
+ const struct object_id *peeled)
966
{
967
- if (fprintf(fh, "%s %s\n", sha1_to_hex(sha1), refname) < 0 ||
968
- (peeled && fprintf(fh, "^%s\n", sha1_to_hex(peeled)) < 0))
967
+ if (fprintf(fh, "%s %s\n", oid_to_hex(oid), refname) < 0 ||
968
+ (peeled && fprintf(fh, "^%s\n", oid_to_hex(peeled)) < 0))
969
return -1;
970
971
return 0;
@@ -1203,8 +1203,8 @@ static int write_with_updates(struct packed_ref_store *refs,
1203
int peel_error = ref_iterator_peel(iter, &peeled);
1204
1205
if (write_packed_entry(out, iter->refname,
1206
- iter->oid->hash,
1207
- peel_error ? NULL : peeled.hash))
1206
+ iter->oid,
1207
+ peel_error ? NULL : &peeled))
1208
goto write_error;
1209
1210
if ((ok = ref_iterator_advance(iter)) != ITER_OK)
@@ -1224,8 +1224,8 @@ static int write_with_updates(struct packed_ref_store *refs,
1224
&peeled);
1225
1226
if (write_packed_entry(out, update->refname,
1227
- update->new_oid.hash,
1228
- peel_error ? NULL : peeled.hash))
1227
+ &update->new_oid,
1228
+ peel_error ? NULL : &peeled))
1229
goto write_error;
1230
1231
i++;