From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH v3 04/23] refs.c: move update_ref to refs.c
Date: Tue, 19 Aug 2014 09:30:28 -0700 [thread overview]
Message-ID: <1408465847-30384-5-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1408465847-30384-1-git-send-email-sahlberg@google.com>
This change moves update_ref() to the refs.c file since this function
does not contain any backend specific code.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
refs-be-files.c | 23 -----------------------
refs.c | 25 +++++++++++++++++++++++++
2 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/refs-be-files.c b/refs-be-files.c
index 4a22513..eb66cf7 100644
--- a/refs-be-files.c
+++ b/refs-be-files.c
@@ -3576,29 +3576,6 @@ int transaction_delete_sha1(struct ref_transaction *transaction,
old_sha1, flags, have_old, msg, err);
}
-int update_ref(const char *action, const char *refname,
- const unsigned char *sha1, const unsigned char *oldval,
- int flags, struct strbuf *e)
-{
- struct ref_transaction *t;
- struct strbuf err = STRBUF_INIT;
-
- t = transaction_begin(&err);
- if (!t ||
- transaction_update_sha1(t, refname, sha1, oldval, flags,
- !!oldval, action, &err) ||
- transaction_commit(t, &err)) {
- const char *str = "update_ref failed for ref '%s': %s";
-
- transaction_free(t);
- if (e)
- strbuf_addf(e, str, refname, err.buf);
- strbuf_release(&err);
- return 1;
- }
- return 0;
-}
-
static int ref_update_compare(const void *r1, const void *r2)
{
const struct ref_update * const *u1 = r1;
diff --git a/refs.c b/refs.c
index 77492ff..5f6a1e7 100644
--- a/refs.c
+++ b/refs.c
@@ -1,3 +1,28 @@
/*
* Common refs code for all backends.
*/
+#include "cache.h"
+#include "refs.h"
+
+int update_ref(const char *action, const char *refname,
+ const unsigned char *sha1, const unsigned char *oldval,
+ int flags, struct strbuf *e)
+{
+ struct ref_transaction *t;
+ struct strbuf err = STRBUF_INIT;
+
+ t = transaction_begin(&err);
+ if (!t ||
+ transaction_update_sha1(t, refname, sha1, oldval, flags,
+ !!oldval, action, &err) ||
+ transaction_commit(t, &err)) {
+ const char *str = "update_ref failed for ref '%s': %s";
+
+ transaction_free(t);
+ if (e)
+ strbuf_addf(e, str, refname, err.buf);
+ strbuf_release(&err);
+ return 1;
+ }
+ return 0;
+}
--
2.0.1.552.g1af257a
next prev parent reply other threads:[~2014-08-19 16:31 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-19 16:30 [PATCH v3 00/23] backend-struct-db Ronnie Sahlberg
2014-08-19 16:30 ` [PATCH v3 01/23] refs.c: create a public function for is_refname_available Ronnie Sahlberg
2014-08-19 16:30 ` [PATCH v3 03/23] refs.c: add a new refs.c file to hold all common refs code Ronnie Sahlberg
2014-08-26 21:31 ` Junio C Hamano
2014-08-26 22:00 ` Ronnie Sahlberg
2014-08-19 16:30 ` Ronnie Sahlberg [this message]
2014-08-19 16:30 ` [PATCH v3 05/23] refs.c: move delete_ref to the common code Ronnie Sahlberg
2014-08-19 16:30 ` [PATCH v3 06/23] refs.c: move rename_ref " Ronnie Sahlberg
2014-08-19 16:30 ` [PATCH v3 07/23] refs.c: move read_ref_at to the common refs file Ronnie Sahlberg
2014-08-19 16:30 ` [PATCH v3 08/23] refs.c: move the hidden refs functions to the common code Ronnie Sahlberg
2014-08-19 16:30 ` [PATCH v3 09/23] refs.c: move dwim and friend functions to the common refs code Ronnie Sahlberg
2014-08-19 16:30 ` [PATCH v3 10/23] refs.c: move warn_if_dangling_symref* to the common code Ronnie Sahlberg
2014-08-19 16:30 ` [PATCH v3 11/23] refs.c: move read_ref, read_ref_full and ref_exists " Ronnie Sahlberg
2014-08-19 16:30 ` [PATCH v3 12/23] refs.c: move resolve_refdup to common Ronnie Sahlberg
2014-08-19 16:30 ` [PATCH v3 13/23] refs.c: move check_refname_component to the common code Ronnie Sahlberg
2014-08-19 16:30 ` [PATCH v3 14/23] refs.c: move is_branch " Ronnie Sahlberg
2014-08-19 16:30 ` [PATCH v3 15/23] refs.c: move names_conflict " Ronnie Sahlberg
2014-08-19 16:30 ` [PATCH v3 16/23] refs.c: move prettify_refname " Ronnie Sahlberg
2014-08-19 16:30 ` [PATCH v3 17/23] refs.c: move ref iterators " Ronnie Sahlberg
2014-08-19 16:30 ` [PATCH v3 18/23] refs.c: move head_ref_namespaced " Ronnie Sahlberg
2014-08-19 16:30 ` [PATCH v3 19/23] refs-be-files.c: add a backend method structure with transaction functions Ronnie Sahlberg
2014-08-26 21:38 ` Junio C Hamano
2014-08-26 22:34 ` Ronnie Sahlberg
2014-08-19 16:30 ` [PATCH v3 20/23] refs-be-files.c: add reflog backend methods Ronnie Sahlberg
2014-08-19 16:30 ` [PATCH v3 21/23] refs-be-files.c: add methods for misc ref operations Ronnie Sahlberg
2014-08-19 16:30 ` [PATCH v3 22/23] refs-be-files.c: add methods for head_ref* Ronnie Sahlberg
2014-08-19 16:30 ` [PATCH v3 23/23] refs-be-files.c: add methods for the ref iterators 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=1408465847-30384-5-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).