From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ronnie Sahlberg Subject: [PATCH v20 27/48] sequencer.c: use ref transactions for all ref updates Date: Fri, 20 Jun 2014 07:43:08 -0700 Message-ID: <1403275409-28173-28-git-send-email-sahlberg@google.com> References: <1403275409-28173-1-git-send-email-sahlberg@google.com> Cc: Ronnie Sahlberg To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Jun 20 16:47:07 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Wy05n-0004LJ-9k for gcvg-git-2@plane.gmane.org; Fri, 20 Jun 2014 16:47:03 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754169AbaFTOqN (ORCPT ); Fri, 20 Jun 2014 10:46:13 -0400 Received: from mail-qa0-f74.google.com ([209.85.216.74]:56829 "EHLO mail-qa0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753267AbaFTOne (ORCPT ); Fri, 20 Jun 2014 10:43:34 -0400 Received: by mail-qa0-f74.google.com with SMTP id w8so504862qac.3 for ; Fri, 20 Jun 2014 07:43:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=j13SvQS1IlvajmUEpAk0e+2dTt71kmC74g22vDw4tz0=; b=Gek6cu4bisR70DMLEJtJppZfTwlBNfI8z+TNPtWweQSyz4QoXbxMq0YvDrg+UAqLPq BqgD3J6tEKeiOXKcR6gNBwPNNCoNDvMqq6ItxxG2QF1Nh6vf1YTZhtuLAQYVxijJzlul J6zwb832TiRIVm5LLqs6rueB8B72mHiMiv6jT21un6EYOEzHoo2tgxjttjKUPVMr8+Q9 Fj3N/6B9+TxTGAEayFbL7YCnLaHyyy9jjc5VdLlUwsMe/pTH9QsMNwTqo5UHgeaG8K27 e2BHWewQfekjkp4Icib8b6npnEh7/rWD4DpPIDdpa/I9sGVfWHuC9seG5IDhTJqHqEGw 1ZaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=j13SvQS1IlvajmUEpAk0e+2dTt71kmC74g22vDw4tz0=; b=DBirZozRfr5hXX3a8mbHaiSouuXA4IaLk6wPla1PBCvoer8VdJAdQ6OWtrt4nVoui4 dJYo1BOifQlvkqWnnvLAb/4bUgz4uxqRGL0s6KCwryDPrbnYS/RduHBy/Ti93YyxhmN5 LWVzxbU0SfpmtRANxERgjoK5QiUnxdD2DJ62yKVIM1kFXHrdjXQBHt9PKJRCOccqTaE3 G+kjcREWyNBsmRyQThIaZZfJsmNnU2ThQgAuEKIkSUydSUYqpYVs9ClG9Q46PjoYveHa dL9nQHmGOEiyvW1HD6ZrC6aCOAkyY8F0Jx+YtgqPdG5AZOYdvYZ1+Ckh32k+xw86cAle sJmw== X-Gm-Message-State: ALoCoQnIdhoqrnbXjC2Xqd/HIm4UYxSMtf/oTh5GHYd05iXFAGB1Rs4NvC08BPXcjhqPfjfDxi8r X-Received: by 10.58.119.138 with SMTP id ku10mr1528128veb.4.1403275413120; Fri, 20 Jun 2014 07:43:33 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id c50si663237yhl.7.2014.06.20.07.43.33 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Jun 2014 07:43:33 -0700 (PDT) Received: from sahlberg1.mtv.corp.google.com (sahlberg1.mtv.corp.google.com [172.27.69.52]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id F1C685A44A6; Fri, 20 Jun 2014 07:43:32 -0700 (PDT) Received: by sahlberg1.mtv.corp.google.com (Postfix, from userid 177442) id D2369E0873; Fri, 20 Jun 2014 07:43:32 -0700 (PDT) X-Mailer: git-send-email 2.0.0.420.g181e020.dirty In-Reply-To: <1403275409-28173-1-git-send-email-sahlberg@google.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Change to use ref transactions for all updates to refs. Reviewed-by: Jonathan Nieder Signed-off-by: Ronnie Sahlberg --- sequencer.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/sequencer.c b/sequencer.c index 0a80c58..fd8acaf 100644 --- a/sequencer.c +++ b/sequencer.c @@ -272,23 +272,31 @@ 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; + struct strbuf err = STRBUF_INIT; 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); - if (!ref_lock) - return error(_("Failed to lock HEAD during fast_forward_to")); strbuf_addf(&sb, "%s: fast-forward", action_name(opts)); - ret = write_ref_sha1(ref_lock, to, sb.buf); + + transaction = ref_transaction_begin(&err); + if (!transaction || + ref_transaction_update(transaction, "HEAD", to, from, + 0, !unborn, &err) || + ref_transaction_commit(transaction, sb.buf, &err)) { + ref_transaction_free(transaction); + error("%s", err.buf); + strbuf_release(&sb); + strbuf_release(&err); + return -1; + } strbuf_release(&sb); - return ret; + ref_transaction_free(transaction); + return 0; } static int do_recursive_merge(struct commit *base, struct commit *next, -- 2.0.0.420.g181e020.dirty