Skip to content

Commit

Permalink
refs/files-backend: convert struct ref_to_prune to object_id
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
bk2204 authored and gitster committed Oct 16, 2017
1 parent 94f5a12 commit 49e9958
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions refs/files-backend.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
};

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 49e9958

Please sign in to comment.