mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs/files-backend: convert struct ref_to_prune to object_id

Browse Source 
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>
This commit is contained in:
brian m. carlson
2017-10-15 22:06:49 +00:00
committed by Junio C Hamano
parent 94f5a121d4
commit 49e9958869
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
refs/files-backend.c
View File

@ -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 {
struct ref_to_prune *next; struct ref_to_prune *next;
unsigned char sha1[20]; struct object_id oid;
char name[FLEX_ARRAY]; 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); transaction = ref_store_transaction_begin(&refs->base, &err);
if (!transaction || 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_ISPRUNING | REF_NODEREF, NULL, &err) ||
ref_transaction_commit(transaction, &err)) { ref_transaction_commit(transaction, &err)) {
ref_transaction_free(transaction); 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)) { if ((flags & PACK_REFS_PRUNE)) {
struct ref_to_prune *n; struct ref_to_prune *n;
FLEX_ALLOC_STR(n, name, iter->refname); FLEX_ALLOC_STR(n, name, iter->refname);
hashcpy(n->sha1, iter->oid->hash); oidcpy(&n->oid, iter->oid);
n->next = refs_to_prune; n->next = refs_to_prune;
refs_to_prune = n; refs_to_prune = n;
} }