From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: Ronnie Sahlberg <sahlberg@google.com>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH v2 01/15] refs.c make ref_transaction_create a wrapper to ref_transaction_update
Date: Mon, 3 Nov 2014 08:55:43 -0800 [thread overview]
Message-ID: <1415033757-9539-2-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1415033757-9539-1-git-send-email-sahlberg@google.com>
The ref_transaction_update function can already be used to create refs by
passing null_sha1 as the old_sha1 parameter. Simplify by replacing
transaction_create with a thin wrapper.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
refs.c | 27 ++-------------------------
1 file changed, 2 insertions(+), 25 deletions(-)
diff --git a/refs.c b/refs.c
index 0368ed4..ed0485e 100644
--- a/refs.c
+++ b/refs.c
@@ -3623,31 +3623,8 @@ int ref_transaction_create(struct ref_transaction *transaction,
int flags, const char *msg,
struct strbuf *err)
{
- struct ref_update *update;
-
- assert(err);
-
- if (transaction->state != REF_TRANSACTION_OPEN)
- die("BUG: create called for transaction that is not open");
-
- if (!new_sha1 || is_null_sha1(new_sha1))
- die("BUG: create ref with null new_sha1");
-
- if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
- strbuf_addf(err, "refusing to create ref with bad name %s",
- refname);
- return -1;
- }
-
- 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,
--
2.1.0.rc2.206.gedb03e5
next prev parent reply other threads:[~2014-11-03 17:03 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-03 16:55 [PATCH v2 00/15] ref-transactions-reflog Ronnie Sahlberg
2014-11-03 16:55 ` Ronnie Sahlberg [this message]
2014-11-03 16:55 ` [PATCH v2 02/15] refs.c: make ref_transaction_delete a wrapper for ref_transaction_update Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 03/15] refs.c: rename the transaction functions Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 04/15] refs.c: add a new update_type field to ref_update Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 05/15] refs.c: add a function to append a reflog entry to a fd Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 06/15] copy.c: make copy_fd preserve meaningful errno Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 07/15] refs.c: add a transaction function to append a reflog entry Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 08/15] refs.c: add a flag to allow reflog updates to truncate the log Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 09/15] refs.c: only write reflog update if msg is non-NULL Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 10/15] refs.c: allow multiple reflog updates during a single transaction Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 11/15] reflog.c: use a reflog transaction when writing during expire Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 12/15] refs.c: rename log_ref_setup to create_reflog Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 13/15] refs.c: make unlock_ref/close_ref/commit_ref static Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 14/15] refs.c: remove lock_any_ref_for_update Ronnie Sahlberg
2014-11-03 16:55 ` [PATCH v2 15/15] refs.c: allow deleting refs with a broken sha1 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=1415033757-9539-2-git-send-email-sahlberg@google.com \
--to=sahlberg@google.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.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.
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).