[PATCH v3 14/19] sequencer.c: use ref transactions for all ref updates
From: Ronnie Sahlberg <hidden>
Date: 2016-06-15 23:00:50
Subsystem:
the rest · Maintainer:
Linus Torvalds
Change to use ref transactions for all updates to refs. Signed-off-by: Ronnie Sahlberg <redacted> --- sequencer.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index bde5f04..7d59f58 100644
--- a/sequencer.c
+++ b/sequencer.c@@ -272,19 +272,29 @@ 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; + char *err = NULL; 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); + strbuf_addf(&sb, "%s: fast-forward", action_name(opts)); - ret = write_ref_sha1(ref_lock, to, sb.buf); + + transaction = ref_transaction_begin(); + if ((!transaction || + ref_transaction_update(transaction, "HEAD", to, from, + 0, !unborn)) || + (ref_transaction_commit(transaction, sb.buf, &err) && + !(transaction = NULL))) { + ref_transaction_rollback(transaction); + strbuf_release(&sb); + return error(_("HEAD: Could not fast-forward: %s\n"), err); + } + strbuf_release(&sb); - return ret; + return 0; } static int do_recursive_merge(struct commit *base, struct commit *next,
--
1.9.1.521.g5dc89fa