diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-10-15 22:06:49 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-16 11:05:50 +0900 |
| commit | 49e9958869670d829edd63a54dabc46496a3cb48 (patch) | |
| tree | 39c959d3b0c02cf12f85ef41ee1b91969bf83dec | |
| parent | 94f5a121d4816969fc00a17411a30d15d80d21e9 (diff) | |
| download | git-49e9958869670d829edd63a54dabc46496a3cb48.tar.gz | |
refs/files-backend: convert struct ref_to_prune to object_id
Change the member of this struct to be a struct object_id.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | refs/files-backend.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/refs/files-backend.c b/refs/files-backend.c index 014dabb0bf..9db9237f1e 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -926,7 +926,7 @@ static struct ref_lock *lock_ref_sha1_basic(struct files_ref_store *refs, struct ref_to_prune { struct ref_to_prune *next; - unsigned char sha1[20]; + struct object_id oid; char name[FLEX_ARRAY]; }; @@ -994,7 +994,7 @@ static void prune_ref(struct files_ref_store *refs, struct ref_to_prune *r) transaction = ref_store_transaction_begin(&refs->base, &err); if (!transaction || - ref_transaction_delete(transaction, r->name, r->sha1, + ref_transaction_delete(transaction, r->name, r->oid.hash, REF_ISPRUNING | REF_NODEREF, NULL, &err) || ref_transaction_commit(transaction, &err)) { ref_transaction_free(transaction); @@ -1088,7 +1088,7 @@ static int files_pack_refs(struct ref_store *ref_store, unsigned int flags) if ((flags & PACK_REFS_PRUNE)) { struct ref_to_prune *n; FLEX_ALLOC_STR(n, name, iter->refname); - hashcpy(n->sha1, iter->oid->hash); + oidcpy(&n->oid, iter->oid); n->next = refs_to_prune; refs_to_prune = n; } |