Change the update_ref helper function to use a ref transaction internally.

Signed-off-by: Ronnie Sahlberg <sahlb...@google.com>
---
 refs.c | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/refs.c b/refs.c
index 0a4e28e..563f336 100644
--- a/refs.c
+++ b/refs.c
@@ -3396,11 +3396,28 @@ int update_ref(const char *action, const char *refname,
               const unsigned char *sha1, const unsigned char *oldval,
               int flags, enum action_on_err onerr)
 {
-       struct ref_lock *lock;
-       lock = update_ref_lock(refname, oldval, flags, NULL, onerr);
-       if (!lock)
+       struct ref_transaction *t;
+       struct strbuf err = STRBUF_INIT;
+
+       t = ref_transaction_begin();
+       if ((!t ||
+           ref_transaction_update(t, refname, sha1, oldval, flags,
+                                  !!oldval)) ||
+           (ref_transaction_commit(t, action, &err) && !(t = NULL))) {
+               const char *str = "update_ref failed for ref '%s': %s";
+
+               ref_transaction_rollback(t);
+               switch (onerr) {
+               case UPDATE_REFS_MSG_ON_ERR:
+                       error(str, refname, err.buf); break;
+               case UPDATE_REFS_DIE_ON_ERR:
+                       die(str, refname, err.buf); break;
+               case UPDATE_REFS_QUIET_ON_ERR: break;
+               }
+               strbuf_release(&err);
                return 1;
-       return update_ref_write(action, refname, sha1, lock, NULL, onerr);
+       }
+       return 0;
 }
 
 static int ref_update_compare(const void *r1, const void *r2)
-- 
1.9.1.528.g98b8868.dirty

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to