From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH 01/11] refs.c make ref_transaction_create a wrapper to ref_transaction_update
Date: Wed, 4 Jun 2014 11:57:42 -0700 [thread overview]
Message-ID: <1401908272-7600-2-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1401908272-7600-1-git-send-email-sahlberg@google.com>
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
refs.c | 11 ++---------
refs.h | 7 ++++---
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/refs.c b/refs.c
index f8a6c9a..2dfedf4 100644
--- a/refs.c
+++ b/refs.c
@@ -3464,15 +3464,8 @@ int ref_transaction_create(struct ref_transaction *transaction,
if (!new_sha1 || is_null_sha1(new_sha1))
die("BUG: create ref with null new_sha1");
- update = add_update(transaction, refname);
-
- hashcpy(update->new_sha1, new_sha1);
- hashclr(update->old_sha1);
- update->flags = flags;
- update->have_old = 1;
- if (msg)
- update->msg = xstrdup(msg);
- return 0;
+ return ref_transaction_update(transaction, refname, new_sha1,
+ null_sha1, flags, 1, msg, err);
}
int ref_transaction_delete(struct ref_transaction *transaction,
diff --git a/refs.h b/refs.h
index 8177052..eedddbf 100644
--- a/refs.h
+++ b/refs.h
@@ -273,9 +273,10 @@ 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
- * be deleted. If have_old is true, then old_sha1 holds the value
- * that the reference should have had before the update, or zeros if
- * it must not have existed beforehand.
+ * 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
+ * already exist and a new ref will be created with new_sha1.
* Function returns 0 on success and non-zero on failure. A failure to update
* means that the transaction as a whole has failed and will need to be
* rolled back.
--
2.0.0.578.gb9e379f
next prev parent reply other threads:[~2014-06-04 18:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-04 18:57 [PATCH 00/11] Add transaction support for reflog Ronnie Sahlberg
2014-06-04 18:57 ` Ronnie Sahlberg [this message]
2014-06-04 18:57 ` [PATCH 02/11] refs.c: make ref_transaction_delete a wrapper for ref_transaction_update Ronnie Sahlberg
2014-06-04 18:57 ` [PATCH 03/11] refs.c: rename the transaction functions Ronnie Sahlberg
2014-06-04 18:57 ` [PATCH 04/11] refs.c: add a new update_type field to ref_update Ronnie Sahlberg
2014-06-04 18:57 ` [PATCH 05/11] refs.c: add a function to append a reflog entry to a fd Ronnie Sahlberg
2014-06-04 18:57 ` [PATCH 06/11] lockfile.c: make hold_lock_file_for_append preserve meaningful errno Ronnie Sahlberg
2014-06-04 18:57 ` [PATCH 07/11] refs.c: add a transaction function to append a reflog entry Ronnie Sahlberg
2014-06-04 18:57 ` [PATCH 08/11] refs.c: add a flag to allow reflog updates to truncate the log Ronnie Sahlberg
2014-06-04 18:57 ` [PATCH 09/11] refs.c: only write reflog update if msg is non-NULL Ronnie Sahlberg
2014-06-04 18:57 ` [PATCH 10/11] refs.c: allow multiple reflog updates during a single transaction Ronnie Sahlberg
2014-06-04 18:57 ` [PATCH 11/11] reflog.c: use a reflog transaction when writing during expire 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1401908272-7600-2-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.
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 NNTP newsgroup(s).