[PATCH 11/23] files_transaction_cleanup(): new helper function

[Michael Haggerty]

Extract function from `files_transaction_commit()`. It will soon have
another caller.

Signed-off-by: Michael Haggerty <mhag...@alum.mit.edu>
---
 refs/files-backend.c | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/refs/files-backend.c b/refs/files-backend.c
index ba0ad0aa44..7ddd4f87d5 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -2846,6 +2846,27 @@ static int lock_ref_for_update(struct files_ref_store 
*refs,
        return 0;
 }
 
+/*
+ * Unlock any references in `transaction` that are still locked, and
+ * mark the transaction closed.
+ */
+static void files_transaction_cleanup(struct ref_transaction *transaction)
+{
+       size_t i;
+
+       for (i = 0; i < transaction->nr; i++) {
+               struct ref_update *update = transaction->updates[i];
+               struct ref_lock *lock = update->backend_data;
+
+               if (lock) {
+                       unlock_ref(lock);
+                       update->backend_data = NULL;
+               }
+       }
+
+       transaction->state = REF_TRANSACTION_CLOSED;
+}
+
 static int files_transaction_commit(struct ref_store *ref_store,
                                    struct ref_transaction *transaction,
                                    struct strbuf *err)
@@ -2868,10 +2889,8 @@ static int files_transaction_commit(struct ref_store 
*ref_store,
        if (transaction->state != REF_TRANSACTION_OPEN)
                die("BUG: commit called for transaction that is not open");
 
-       if (!transaction->nr) {
-               transaction->state = REF_TRANSACTION_CLOSED;
-               return 0;
-       }
+       if (!transaction->nr)
+               goto cleanup;
 
        /*
         * Fail if a refname appears more than once in the
@@ -3017,15 +3036,11 @@ static int files_transaction_commit(struct ref_store 
*ref_store,
        clear_loose_ref_cache(refs);
 
 cleanup:
+       files_transaction_cleanup(transaction);
        strbuf_release(&sb);
-       transaction->state = REF_TRANSACTION_CLOSED;
 
        for (i = 0; i < transaction->nr; i++) {
                struct ref_update *update = transaction->updates[i];
-               struct ref_lock *lock = update->backend_data;
-
-               if (lock)
-                       unlock_ref(lock);
 
                if (update->flags & REF_DELETED_LOOSE) {
                        /*
-- 
2.11.0