From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH v2 02/14] refs.c: make ref_transaction_delete a wrapper for ref_transaction_update
Date: Mon, 16 Jun 2014 09:51:33 -0700 [thread overview]
Message-ID: <1402937505-6091-3-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1402937505-6091-1-git-send-email-sahlberg@google.com>
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
refs.c | 17 +++++------------
refs.h | 2 +-
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/refs.c b/refs.c
index c62df4c..76732a4 100644
--- a/refs.c
+++ b/refs.c
@@ -3525,24 +3525,17 @@ int ref_transaction_delete(struct ref_transaction *transaction,
int flags, int have_old, const char *msg,
struct strbuf *err)
{
- struct ref_update *update;
-
if (transaction->state != REF_TRANSACTION_OPEN)
die("BUG: delete called for transaction that is not open");
if (have_old && !old_sha1)
die("BUG: have_old is true but old_sha1 is NULL");
- update = add_update(transaction, refname);
- update->flags = flags;
- update->have_old = have_old;
- if (have_old) {
- assert(!is_null_sha1(old_sha1));
- hashcpy(update->old_sha1, old_sha1);
- }
- if (msg)
- update->msg = xstrdup(msg);
- return 0;
+ if (have_old && is_null_sha1(old_sha1))
+ die("BUG: have_old is true but old_sha1 is null_sha1");
+
+ return ref_transaction_update(transaction, refname, null_sha1,
+ old_sha1, flags, have_old, msg, err);
}
int update_ref(const char *action, const char *refname,
diff --git a/refs.h b/refs.h
index 4843706..43aafb7 100644
--- a/refs.h
+++ b/refs.h
@@ -281,7 +281,7 @@ struct ref_transaction *ref_transaction_begin(struct strbuf *err);
/*
* Add a reference update to transaction. new_sha1 is the value that
- * the reference should have after the update, or zeros if it should
+ * the reference should have after the update, or null_sha1 if it should
* be deleted. If have_old is true and old_sha is not the null_sha1
* then the previous value of the ref must match or the update will fail.
* If have_old is true and old_sha1 is the null_sha1 then the ref must not
--
2.0.0.770.gd892650.dirty
next prev parent reply other threads:[~2014-06-16 16:52 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-16 16:51 [PATCH v2 00/14] ref-transactions-reflog Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 01/14] refs.c make ref_transaction_create a wrapper to ref_transaction_update Ronnie Sahlberg
2014-06-16 16:51 ` Ronnie Sahlberg [this message]
2014-06-16 16:51 ` [PATCH v2 03/14] refs.c: rename the transaction functions Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 04/14] refs.c: add a new update_type field to ref_update Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 05/14] refs.c: add a function to append a reflog entry to a fd Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 06/14] lockfile.c: make hold_lock_file_for_append preserve meaningful errno Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 07/14] refs.c: add a transaction function to append a reflog entry Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 08/14] refs.c: add a flag to allow reflog updates to truncate the log Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 09/14] refs.c: only write reflog update if msg is non-NULL Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 10/14] refs.c: allow multiple reflog updates during a single transaction Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 11/14] reflog.c: use a reflog transaction when writing during expire Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 12/14] refs.c: rename log_ref_setup to create_reflog Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 13/14] refs.c: make unlock_ref/close_ref/commit_ref static Ronnie Sahlberg
2014-06-16 16:51 ` [PATCH v2 14/14] refs.c: remove lock_any_ref_for_update Ronnie Sahlberg
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=1402937505-6091-3-git-send-email-sahlberg@google.com \
--to=sahlberg@google.com \
--cc=git@vger.kernel.org \
/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).