From: Ronnie Sahlberg Date: Mon, 21 Apr 2014 22:53:27 GMT Subject: [PATCH v2 09/13] sequencer.c: use ref transactions for all ref updates Message-ID: <1398120811-20284-10-git-send-email-sahlberg@google.com> In-Reply-To: <1398120811-20284-1-git-send-email-sahlberg@google.com> Change to use ref transactions for all updates to refs. Signed-off-by: Ronnie Sahlberg --- sequencer.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/sequencer.c b/sequencer.c index bde5f04..fa14ac0 100644 --- a/sequencer.c +++ b/sequencer.c @@ -272,17 +272,26 @@ static int error_dirty_index(struct replay_opts *opts) static int fast_forward_to(const unsigned char *to, const unsigned char *from, int unborn, struct replay_opts *opts) { - struct ref_lock *ref_lock; + struct ref_transaction *transaction; struct strbuf sb = STRBUF_INIT; int ret; read_cache(); if (checkout_fast_forward(from, to, 1)) exit(1); /* the callee should have complained already */ - ref_lock = lock_any_ref_for_update("HEAD", unborn ? null_sha1 : from, - 0, NULL); + + transaction = ref_transaction_begin(); + if (!transaction) + return 1; + if (ref_transaction_update(transaction, "HEAD", to, from, + 0, !unborn)) { + ref_transaction_rollback(transaction); + return 1; + } + strbuf_addf(&sb, "%s: fast-forward", action_name(opts)); - ret = write_ref_sha1(ref_lock, to, sb.buf); + ret = ref_transaction_commit(transaction, sb.buf, + UPDATE_REFS_MSG_ON_ERR); strbuf_release(&sb); return ret; } -- 1.9.1.515.g3b87021