ref_transaction_commit(): correctly report close_ref() failure
authorMichael Haggerty <mhagger@alum.mit.edu>
Mon, 25 Apr 2016 09:58:23 +0000 (11:58 +0200)
committerMichael Haggerty <mhagger@alum.mit.edu>
Mon, 13 Jun 2016 09:23:49 +0000 (11:23 +0200)
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
refs/files-backend.c
index 35d37ce58beab5954751687c8517c4b9559ba432..85e1e1c759d37eaa2bf3f2ce8fafc48ac280867a 100644 (file)
@@ -3139,6 +3139,7 @@ int ref_transaction_commit(struct ref_transaction *transaction,
                        if (close_ref(update->lock)) {
                                strbuf_addf(err, "couldn't close '%s.lock'",
                                            update->refname);
                        if (close_ref(update->lock)) {
                                strbuf_addf(err, "couldn't close '%s.lock'",
                                            update->refname);
+                               ret = TRANSACTION_GENERIC_ERROR;
                                goto cleanup;
                        }
                }
                                goto cleanup;
                        }
                }