diff options
| author |  Michael Haggerty <mhagger@alum.mit.edu> | 2017-11-05 09:42:08 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-11-06 10:31:08 +0900 |
| commit | 417018826285140f9e948649ff9cf75a193075d2 (patch) | |
| tree | 42158f5c01900fc52862b4f27925a3067edb3064 | |
| parent | refs: rename constant `REF_ISPRUNING` to `REF_IS_PRUNING` (diff) | |
| download | tgif-417018826285140f9e948649ff9cf75a193075d2.tar.xz | |
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>
| -rw-r--r-- | refs/packed-backend.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/refs/packed-backend.c b/refs/packed-backend.c index 74f1dea0f4..43ad74fc5a 100644 --- a/refs/packed-backend.c +++ b/refs/packed-backend.c @@ -961,11 +961,11 @@ static struct ref_iterator *packed_ref_iterator_begin( * by the failing call to `fprintf()`. */ static int write_packed_entry(FILE *fh, const char *refname, - const unsigned char *sha1, - const unsigned char *peeled) + const struct object_id *oid, + const struct object_id *peeled) { - if (fprintf(fh, "%s %s\n", sha1_to_hex(sha1), refname) < 0 || - (peeled && fprintf(fh, "^%s\n", sha1_to_hex(peeled)) < 0)) + if (fprintf(fh, "%s %s\n", oid_to_hex(oid), refname) < 0 || + (peeled && fprintf(fh, "^%s\n", oid_to_hex(peeled)) < 0)) return -1; return 0; @@ -1203,8 +1203,8 @@ static int write_with_updates(struct packed_ref_store *refs, int peel_error = ref_iterator_peel(iter, &peeled); if (write_packed_entry(out, iter->refname, - iter->oid->hash, - peel_error ? NULL : peeled.hash)) + iter->oid, + peel_error ? NULL : &peeled)) goto write_error; if ((ok = ref_iterator_advance(iter)) != ITER_OK) @@ -1224,8 +1224,8 @@ static int write_with_updates(struct packed_ref_store *refs, &peeled); if (write_packed_entry(out, update->refname, - update->new_oid.hash, - peel_error ? NULL : peeled.hash)) + &update->new_oid, + peel_error ? NULL : &peeled)) goto write_error; i++; |