[PATCH v3 05/23] refs.c: move delete_ref to the common code
From: Ronnie Sahlberg <hidden>
Date: 2016-06-15 23:02:18
Subsystem:
the rest · Maintainer:
Linus Torvalds
This change moves delete_ref() to the refs.c file since this function does not contain any backend specific code. Signed-off-by: Ronnie Sahlberg <redacted> --- refs-be-files.c | 19 ------------------- refs.c | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/refs-be-files.c b/refs-be-files.c
index eb66cf7..faf794c 100644
--- a/refs-be-files.c
+++ b/refs-be-files.c@@ -2622,25 +2622,6 @@ static int delete_ref_loose(struct ref_lock *lock, int flag, struct strbuf *err) return 0; } -int delete_ref(const char *refname, const unsigned char *sha1, int delopt) -{ - struct ref_transaction *transaction; - struct strbuf err = STRBUF_INIT; - - transaction = transaction_begin(&err); - if (!transaction || - transaction_delete_sha1(transaction, refname, sha1, delopt, - sha1 && !is_null_sha1(sha1), NULL, &err) || - transaction_commit(transaction, &err)) { - error("%s", err.buf); - transaction_free(transaction); - strbuf_release(&err); - return 1; - } - transaction_free(transaction); - return 0; -} - struct rename_reflog_cb { struct ref_transaction *transaction; const char *refname;
diff --git a/refs.c b/refs.c
index 5f6a1e7..70b12eb 100644
--- a/refs.c
+++ b/refs.c@@ -26,3 +26,22 @@ int update_ref(const char *action, const char *refname, } return 0; } + +int delete_ref(const char *refname, const unsigned char *sha1, int delopt) +{ + struct ref_transaction *transaction; + struct strbuf err = STRBUF_INIT; + + transaction = transaction_begin(&err); + if (!transaction || + transaction_delete_sha1(transaction, refname, sha1, delopt, + sha1 && !is_null_sha1(sha1), NULL, &err) || + transaction_commit(transaction, &err)) { + error("%s", err.buf); + transaction_free(transaction); + strbuf_release(&err); + return 1; + } + transaction_free(transaction); + return 0; +}
--
2.0.1.552.g1af257a