mirror of
https://github.com/git/git
synced 2024-10-02 14:45:21 +00:00
prune_ref(): call ref_transaction_add_update()
directly
`prune_ref()` needs to use the `REF_ISPRUNING` flag, but we want to make that flag private to the files backend. So instead of calling `ref_transaction_delete()`, which is a public function and therefore shouldn't allow the `REF_ISPRUNING` flag, change `prune_ref()` to call `ref_transaction_add_update()`, which is private to the refs module. (Note that we don't need any of the other services provided by `ref_transaction_delete()`.) This allows us to change `ref_transaction_update()` to reject the `REF_ISPRUNING` flag. Do so by adjusting `REF_TRANSACTION_UPDATE_ALLOWED_FLAGS`. Also add parentheses to its definition to avoid potential future mishaps. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
b0ca411051
commit
b00f3cfa92
4
refs.h
4
refs.h
|
@ -349,9 +349,7 @@ int refs_pack_refs(struct ref_store *refs, unsigned int flags);
|
||||||
* Flags that can be passed in to ref_transaction_update
|
* Flags that can be passed in to ref_transaction_update
|
||||||
*/
|
*/
|
||||||
#define REF_TRANSACTION_UPDATE_ALLOWED_FLAGS \
|
#define REF_TRANSACTION_UPDATE_ALLOWED_FLAGS \
|
||||||
REF_ISPRUNING | \
|
(REF_NODEREF | REF_FORCE_CREATE_REFLOG)
|
||||||
REF_FORCE_CREATE_REFLOG | \
|
|
||||||
REF_NODEREF
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Setup reflog before using. Fill in err and return -1 on failure.
|
* Setup reflog before using. Fill in err and return -1 on failure.
|
||||||
|
|
|
@ -989,22 +989,29 @@ static void prune_ref(struct files_ref_store *refs, struct ref_to_prune *r)
|
||||||
{
|
{
|
||||||
struct ref_transaction *transaction;
|
struct ref_transaction *transaction;
|
||||||
struct strbuf err = STRBUF_INIT;
|
struct strbuf err = STRBUF_INIT;
|
||||||
|
int ret = -1;
|
||||||
|
|
||||||
if (check_refname_format(r->name, 0))
|
if (check_refname_format(r->name, 0))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
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->oid,
|
goto cleanup;
|
||||||
REF_ISPRUNING | REF_NODEREF, NULL, &err) ||
|
ref_transaction_add_update(
|
||||||
ref_transaction_commit(transaction, &err)) {
|
transaction, r->name,
|
||||||
ref_transaction_free(transaction);
|
REF_NODEREF | REF_HAVE_NEW | REF_HAVE_OLD | REF_ISPRUNING,
|
||||||
|
&null_oid, &r->oid, NULL);
|
||||||
|
if (ref_transaction_commit(transaction, &err))
|
||||||
|
goto cleanup;
|
||||||
|
|
||||||
|
ret = 0;
|
||||||
|
|
||||||
|
cleanup:
|
||||||
|
if (ret)
|
||||||
error("%s", err.buf);
|
error("%s", err.buf);
|
||||||
strbuf_release(&err);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
ref_transaction_free(transaction);
|
|
||||||
strbuf_release(&err);
|
strbuf_release(&err);
|
||||||
|
ref_transaction_free(transaction);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue