[PATCH 14/15] refs.c: make lock_packed_refs take an err argument

[Ronnie Sahlberg]

Change-Id: Ibfc64ab19257484129ab0ad861b72c02414388df
Signed-off-by: Ronnie Sahlberg <sahlb...@google.com>
---
 refs.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/refs.c b/refs.c
index e0d5a82..7fb0d6c 100644
--- a/refs.c
+++ b/refs.c
@@ -2393,13 +2393,17 @@ static int write_packed_entry_fn(struct ref_entry 
*entry, void *cb_data)
        return 0;
 }
 
-/* This should return a meaningful errno on failure */
-static int lock_packed_refs(int flags)
+static int lock_packed_refs(struct strbuf *err)
 {
        struct packed_ref_cache *packed_ref_cache;
 
-       if (hold_lock_file_for_update(&packlock, git_path("packed-refs"), 
flags) < 0)
+       if (hold_lock_file_for_update(&packlock, git_path("packed-refs"),
+                                     0) < 0) {
+               if (err)
+                       unable_to_lock_message(git_path("packed-refs"),
+                                              errno, err);
                return -1;
+       }
        /*
         * Get the current packed-refs while holding the lock.  If the
         * packed-refs file has been modified since we last read it,
@@ -2587,11 +2591,14 @@ static void prune_refs(struct ref_to_prune *r)
 int pack_refs(unsigned int flags)
 {
        struct pack_refs_cb_data cbdata;
+       struct strbuf err = STRBUF_INIT;
 
        memset(&cbdata, 0, sizeof(cbdata));
        cbdata.flags = flags;
 
-       lock_packed_refs(LOCK_DIE_ON_ERROR);
+       if (lock_packed_refs(&err))
+               die("%s", err.buf);
+
        cbdata.packed_refs = get_packed_refs(&ref_cache);
 
        do_for_each_entry_in_dir(get_loose_refs(&ref_cache), 0,
@@ -3757,10 +3764,7 @@ int transaction_commit(struct transaction *transaction,
        }
 
        /* Lock packed refs during commit */
-       if (lock_packed_refs(0)) {
-               if (err)
-                       unable_to_lock_message(git_path("packed-refs"),
-                                              errno, err);
+       if (lock_packed_refs(err)) {
                ret = -1;
                goto cleanup;
        }
@@ -3815,10 +3819,7 @@ int transaction_commit(struct transaction *transaction,
                        goto cleanup;
                }
                /* lock the packed refs again so no one can change it */
-               if (lock_packed_refs(0)) {
-                       if (err)
-                               unable_to_lock_message(git_path("packed-refs"),
-                                                      errno, err);
+               if (lock_packed_refs(err)) {
                        ret = -1;
                        goto cleanup;
                }
-- 
2.1.0.rc2.206.gedb03e5

--
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