From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH v18 02/48] refs.c: ref_transaction_commit should not free the transaction
Date: Tue, 17 Jun 2014 08:53:16 -0700 [thread overview]
Message-ID: <1403020442-31049-3-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1403020442-31049-1-git-send-email-sahlberg@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
builtin/update-ref.c | 1 +
refs.c | 1 -
refs.h | 5 ++---
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index 405267f..1fd7a89 100644
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -369,6 +369,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
update_refs_stdin();
ret = ref_transaction_commit(transaction, msg,
UPDATE_REFS_DIE_ON_ERR);
+ ref_transaction_free(transaction);
return ret;
}
diff --git a/refs.c b/refs.c
index 6d841a0..d9cac6d 100644
--- a/refs.c
+++ b/refs.c
@@ -3509,7 +3509,6 @@ cleanup:
if (updates[i]->lock)
unlock_ref(updates[i]->lock);
free(delnames);
- ref_transaction_free(transaction);
return ret;
}
diff --git a/refs.h b/refs.h
index cfd1832..7d946f6 100644
--- a/refs.h
+++ b/refs.h
@@ -219,8 +219,7 @@ enum action_on_err {
/*
* Begin a reference transaction. The reference transaction must
- * eventually be commited using ref_transaction_commit() or freed by
- * calling ref_transaction_free().
+ * be freed by calling ref_transaction_free().
*/
struct ref_transaction *ref_transaction_begin(void);
@@ -268,7 +267,7 @@ void ref_transaction_delete(struct ref_transaction *transaction,
/*
* Commit all of the changes that have been queued in transaction, as
* atomically as possible. Return a nonzero value if there is a
- * problem. The ref_transaction is freed by this function.
+ * problem.
*/
int ref_transaction_commit(struct ref_transaction *transaction,
const char *msg, enum action_on_err onerr);
--
2.0.0.438.gec92e5c
next prev parent reply other threads:[~2014-06-17 15:54 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-17 15:53 [PATCH v18 00/48] Use ref transactions Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 01/48] refs.c: remove ref_transaction_rollback Ronnie Sahlberg
2014-06-17 15:53 ` Ronnie Sahlberg [this message]
2014-06-17 15:53 ` [PATCH v18 03/48] refs.c: constify the sha arguments for ref_transaction_create|delete|update Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 04/48] refs.c: allow passing NULL to ref_transaction_free Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 05/48] refs.c: add a strbuf argument to ref_transaction_commit for error logging Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 06/48] lockfile.c: add a new public function unable_to_lock_message Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 07/48] lockfile.c: make lock_file return a meaningful errno on failurei Ronnie Sahlberg
2014-06-18 20:30 ` Michael Haggerty
2014-06-18 20:36 ` Michael Haggerty
2014-06-17 15:53 ` [PATCH v18 08/48] refs.c: add an err argument to repack_without_refs Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 09/48] refs.c: make sure log_ref_setup returns a meaningful errno Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 10/48] refs.c: verify_lock should set errno to something meaningful Ronnie Sahlberg
2014-06-18 20:38 ` Michael Haggerty
2014-06-18 21:40 ` Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 11/48] refs.c: make remove_empty_directories alwasy set errno to something sane Ronnie Sahlberg
2014-06-18 21:00 ` Michael Haggerty
2014-06-18 21:41 ` Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 12/48] refs.c: commit_packed_refs to return a meaningful errno on failure Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 13/48] refs.c: make resolve_ref_unsafe set errno to something meaningful on error Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 14/48] refs.c: log_ref_write should try to return meaningful errno Ronnie Sahlberg
2014-06-18 21:08 ` Michael Haggerty
2014-06-18 21:38 ` Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 15/48] refs.c: make ref_update_reject_duplicates take a strbuf argument for errors Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 16/48] refs.c: add an err argument to delete_ref_loose Ronnie Sahlberg
2014-06-18 20:47 ` Michael Haggerty
2014-06-18 22:27 ` Ronnie Sahlberg
2014-06-18 22:38 ` Michael Haggerty
2014-06-19 15:56 ` Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 17/48] refs.c: make update_ref_write update a strbuf on failure Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 18/48] update-ref: use err argument to get error from ref_transaction_commit Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 19/48] refs.c: remove the onerr argument to ref_transaction_commit Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 20/48] refs.c: change ref_transaction_update() to do error checking and return status Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 21/48] refs.c: change ref_transaction_create " Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 22/48] refs.c: update ref_transaction_delete to check for error " Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 23/48] refs.c: make ref_transaction_begin take an err argument Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 24/48] refs.c: add transaction.status and track OPEN/CLOSED/ERROR Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 25/48] tag.c: use ref transactions when doing updates Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 26/48] replace.c: use the ref transaction functions for updates Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 27/48] commit.c: use ref transactions " Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 28/48] sequencer.c: use ref transactions for all ref updates Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 29/48] fast-import.c: change update_branch to use ref transactions Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 30/48] branch.c: use ref transaction for all ref updates Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 31/48] refs.c: change update_ref to use a transaction Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 32/48] receive-pack.c: use a reference transaction for updating the refs Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 33/48] fast-import.c: use a ref transaction when dumping tags Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 34/48] walker.c: use ref transaction for ref updates Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 35/48] refs.c: make lock_ref_sha1 static Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 36/48] refs.c: remove the update_ref_lock function Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 37/48] refs.c: remove the update_ref_write function Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 38/48] refs.c: remove lock_ref_sha1 Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 39/48] refs.c: make prune_ref use a transaction to delete the ref Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 40/48] refs.c: make delete_ref use a transaction Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 41/48] refs.c: pass the ref log message to _create/delete/update instead of _commit Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 42/48] refs.c: pass NULL as *flags to read_ref_full Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 43/48] refs.c: move the check for valid refname to lock_ref_sha1_basic Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 44/48] refs.c: call lock_ref_sha1_basic directly from commit Ronnie Sahlberg
2014-06-17 15:53 ` [PATCH v18 45/48] refs.c: pass a skip list to name_conflict_fn Ronnie Sahlberg
2014-06-17 15:54 ` [PATCH v18 46/48] refs.c: propagate any errno==ENOTDIR from _commit back to the callers Ronnie Sahlberg
2014-06-17 15:54 ` [PATCH v18 47/48] fetch.c: change s_update_ref to use a ref transaction Ronnie Sahlberg
2014-06-17 15:54 ` [PATCH v18 48/48] refs.c: make write_ref_sha1 static Ronnie Sahlberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1403020442-31049-3-git-send-email-sahlberg@google.com \
--to=sahlberg@google.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).