[PATCH v2 03/23] refs-common.c: move update_ref to refs-common.c
flat view
DORMANTno replies
SUPERSEDED
From: Ronnie Sahlberg <hidden>
Date: 2016-06-15 23:02:16
Subsystem:
the rest · Maintainer:
Linus Torvalds
Status: Superseded by v3 (posted 2016-06-15). [go to v3]
Revision v2 (3 revisions archived).
Revisions (3)
- v1
- v2 current [diff against previous]
- v3 [diff against previous]
This change moves update_ref() to the refs-common.c file since this function
does not contain any backend specific code.
Signed-off-by: Ronnie Sahlberg <redacted>
---
refs-common.c | 25 +++++++++++++++++++++++++
refs.c | 23 -----------------------
2 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/refs-common.c b/refs-common.c
index 44d96d2..cb884b2 100644
--- a/refs-common.c
+++ b/refs-common.c@@ -1,2 +1,27 @@ /* common code for all ref 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; +}
diff --git a/refs.c b/refs.c
index 4a22513..eb66cf7 100644
--- a/refs.c
+++ b/refs.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;
--
2.0.1.556.g3edca4c