From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Martin Ågren" <martin.agren@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
git@vger.kernel.org, "Michael Haggerty" <mhagger@alum.mit.edu>
Subject: [PATCH v2 2/9] prune_ref(): call `ref_transaction_add_update()` directly
Date: Sun, 5 Nov 2017 09:42:02 +0100 [thread overview]
Message-ID: <4421de69e71019b4f137fbc5ce0c275138691b3c.1509870243.git.mhagger@alum.mit.edu> (raw)
In-Reply-To: <cover.1509870243.git.mhagger@alum.mit.edu>
`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>
---
refs.h | 4 +---
refs/files-backend.c | 25 ++++++++++++++++---------
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/refs.h b/refs.h
index 15fd419c7d..4ffef9502d 100644
--- a/refs.h
+++ b/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
*/
#define REF_TRANSACTION_UPDATE_ALLOWED_FLAGS \
- REF_ISPRUNING | \
- REF_FORCE_CREATE_REFLOG | \
- REF_NODEREF
+ (REF_NODEREF | REF_FORCE_CREATE_REFLOG)
/*
* Setup reflog before using. Fill in err and return -1 on failure.
diff --git a/refs/files-backend.c b/refs/files-backend.c
index fadf1036d3..ba72d28b13 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -989,22 +989,29 @@ static void prune_ref(struct files_ref_store *refs, struct ref_to_prune *r)
{
struct ref_transaction *transaction;
struct strbuf err = STRBUF_INIT;
+ int ret = -1;
if (check_refname_format(r->name, 0))
return;
transaction = ref_store_transaction_begin(&refs->base, &err);
- if (!transaction ||
- ref_transaction_delete(transaction, r->name, &r->oid,
- REF_ISPRUNING | REF_NODEREF, NULL, &err) ||
- ref_transaction_commit(transaction, &err)) {
- ref_transaction_free(transaction);
+ if (!transaction)
+ goto cleanup;
+ ref_transaction_add_update(
+ transaction, r->name,
+ 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);
- strbuf_release(&err);
- return;
- }
- ref_transaction_free(transaction);
strbuf_release(&err);
+ ref_transaction_free(transaction);
+ return;
}
/*
--
2.14.1
next prev parent reply other threads:[~2017-11-05 8:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-05 8:42 [PATCH v2 0/9] Tidy up the constants related to ref_update::flags Michael Haggerty
2017-11-05 8:42 ` [PATCH v2 1/9] files_transaction_prepare(): don't leak flags to packed transaction Michael Haggerty
2017-11-05 8:42 ` Michael Haggerty [this message]
2017-11-05 8:42 ` [PATCH v2 3/9] ref_transaction_update(): die on disallowed flags Michael Haggerty
2017-11-07 20:53 ` Martin Ågren
2017-11-07 22:07 ` Thomas Gummerer
2017-11-05 8:42 ` [PATCH v2 4/9] ref_transaction_add_update(): remove a check Michael Haggerty
2017-11-05 8:42 ` [PATCH v2 5/9] refs: tidy up and adjust visibility of the `ref_update` flags Michael Haggerty
2017-11-05 8:42 ` [PATCH v2 6/9] refs: rename constant `REF_NODEREF` to `REF_NO_DEREF` Michael Haggerty
2017-11-05 8:42 ` [PATCH v2 7/9] refs: rename constant `REF_ISPRUNING` to `REF_IS_PRUNING` Michael Haggerty
2017-11-05 8:42 ` [PATCH v2 8/9] write_packed_entry(): take `object_id` arguments Michael Haggerty
2017-11-05 8:42 ` [PATCH v2 9/9] refs: update some more docs to use "oid" rather than "sha1" Michael Haggerty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4421de69e71019b4f137fbc5ce0c275138691b3c.1509870243.git.mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).