From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonathan Nieder Subject: [PATCH 07/20] commit.c: use ref transactions for updates Date: Tue, 26 Aug 2014 17:31:40 -0700 Message-ID: <20140827003140.GH20185@google.com> References: <20140820231723.GF20185@google.com> <20140826000354.GW20185@google.com> <20140826221448.GY20185@google.com> <20140827002804.GA20185@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Ronnie Sahlberg , "git@vger.kernel.org" , Michael Haggerty To: Junio C Hamano X-From: git-owner@vger.kernel.org Wed Aug 27 02:31:51 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 1XMR9S-00068I-0s for gcvg-git-2@plane.gmane.org; Wed, 27 Aug 2014 02:31:50 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756228AbaH0Abq (ORCPT ); Tue, 26 Aug 2014 20:31:46 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:41113 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755066AbaH0Abp (ORCPT ); Tue, 26 Aug 2014 20:31:45 -0400 Received: by mail-pd0-f173.google.com with SMTP id w10so23564308pde.32 for ; Tue, 26 Aug 2014 17:31:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=vt+SLs7hwj6ua934Em3GD25wSJyp+sA3XIZFpt4+wW4=; b=NTPfSvqi+RbLw+JUOVYa+0YQLcyg9OfDGF/3X/fQNI+UlIIMfdVfVgqf4DPuzabrKY 7ZLAGk/Cl/z677uQDC0d3+qm10znTna0J2pxT7PIxNLUElaE17W7MUY3oy4p2nNvt9GI S0lcsf8I8pFtVenesvUF92DYm6BEJA6gWUu5nJPCBuThFINO4nU/nFXVA/9aAdPaHufc Q7I+QPSvBCii0XIGfGIHjN9f6qfC7ZWEHQRc84tmBgYP4oadfy+MdRPwonOfDPQO4T/3 wcgkdkOrQkT4rBBta5dEXtMcjR8Kv2zvNs2VnkvEHC//4ee+26By1rGqkJlhkNnvtbdx BCwg== X-Received: by 10.70.134.165 with SMTP id pl5mr11830007pdb.20.1409099505256; Tue, 26 Aug 2014 17:31:45 -0700 (PDT) Received: from google.com ([2620:0:1000:5b00:4ba:9bd4:148:77e4]) by mx.google.com with ESMTPSA id te8sm15190286pab.34.2014.08.26.17.31.42 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 26 Aug 2014 17:31:43 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20140827002804.GA20185@google.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Ronnie Sahlberg Date: Wed, 16 Apr 2014 15:34:19 -0700 Change commit.c to use ref transactions for all ref updates. Make sure we pass a NULL pointer to ref_transaction_update if have_old is false. Signed-off-by: Ronnie Sahlberg Signed-off-by: Jonathan Nieder --- builtin/commit.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index 5e2221c..9bf1003 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1627,11 +1627,12 @@ int cmd_commit(int argc, const char **argv, const char *prefix) const char *index_file, *reflog_msg; char *nl; unsigned char sha1[20]; - struct ref_lock *ref_lock; struct commit_list *parents = NULL, **pptr = &parents; struct stat statbuf; struct commit *current_head = NULL; struct commit_extra_header *extra = NULL; + struct ref_transaction *transaction; + struct strbuf err = STRBUF_INIT; if (argc == 2 && !strcmp(argv[1], "-h")) usage_with_options(builtin_commit_usage, builtin_commit_options); @@ -1753,16 +1754,6 @@ int cmd_commit(int argc, const char **argv, const char *prefix) strbuf_release(&author_ident); free_commit_extra_headers(extra); - ref_lock = lock_any_ref_for_update("HEAD", - !current_head - ? NULL - : current_head->object.sha1, - 0, NULL); - if (!ref_lock) { - rollback_index_files(); - die(_("cannot lock HEAD ref")); - } - nl = strchr(sb.buf, '\n'); if (nl) strbuf_setlen(&sb, nl + 1 - sb.buf); @@ -1771,10 +1762,17 @@ int cmd_commit(int argc, const char **argv, const char *prefix) strbuf_insert(&sb, 0, reflog_msg, strlen(reflog_msg)); strbuf_insert(&sb, strlen(reflog_msg), ": ", 2); - if (write_ref_sha1(ref_lock, sha1, sb.buf) < 0) { + transaction = ref_transaction_begin(&err); + if (!transaction || + ref_transaction_update(transaction, "HEAD", sha1, + current_head + ? current_head->object.sha1 : NULL, + 0, !!current_head, &err) || + ref_transaction_commit(transaction, sb.buf, &err)) { rollback_index_files(); - die(_("cannot update HEAD ref")); + die("%s", err.buf); } + ref_transaction_free(transaction); unlink(git_path("CHERRY_PICK_HEAD")); unlink(git_path("REVERT_HEAD")); @@ -1803,5 +1801,6 @@ int cmd_commit(int argc, const char **argv, const char *prefix) if (!quiet) print_summary(prefix, sha1, !current_head); + strbuf_release(&err); return 0; } -- 2.1.0.rc2.206.gedb03e5