From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ronnie Sahlberg Subject: [PATCH v14 17/40] tag.c: use ref transactions when doing updates Date: Fri, 6 Jun 2014 15:28:55 -0700 Message-ID: <1402093758-3162-18-git-send-email-sahlberg@google.com> References: <1402093758-3162-1-git-send-email-sahlberg@google.com> Cc: Ronnie Sahlberg To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Jun 07 00:29:59 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 1Wt2e5-0002R3-TS for gcvg-git-2@plane.gmane.org; Sat, 07 Jun 2014 00:29:58 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752580AbaFFW3a (ORCPT ); Fri, 6 Jun 2014 18:29:30 -0400 Received: from mail-oa0-f74.google.com ([209.85.219.74]:56947 "EHLO mail-oa0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752483AbaFFW3X (ORCPT ); Fri, 6 Jun 2014 18:29:23 -0400 Received: by mail-oa0-f74.google.com with SMTP id m1so741823oag.1 for ; Fri, 06 Jun 2014 15:29:22 -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=PVhCU6Vhb5eQji73JdlWuV9b5myOegF3tHbkMfHIIJE=; b=ShuMeddhkImkwuFDE/3LK/vDCaBdJyVfLQOUormEIs6VghqmQCdF/3Smw1sUukbAhv njl7I+qFv7ewbF3HtDk9yF0Ozeg/0PESohIvmxUXAgHUhP3RuXfn8ZUoXH17qTc61lkB YmZ6bZBQHrLINi+KbGzIMAfuB8t0uyRwjajk3SSTWQVlEyX4Py4FPs7lgT1rSqmyhc0Q W7IxJmcDujqn2gH7INasgmsgdcRTBWAlrqip/SRYxpBU45FxcHPJ4yoZaHG9M9sfdZsW Od8V1TxvjeHrm7J6kFTU28dKGgLXjgzSnp6bJ3el0XZkcpXJreZW15BtIkOnTRQ/dg9G G5oQ== 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=PVhCU6Vhb5eQji73JdlWuV9b5myOegF3tHbkMfHIIJE=; b=CBPMjZT01K0/tXyS4jjGN580SYF1CQLZVeYVZQtc8I+o1Gks6Rac40DVJJUKxdS+PB rFGaK+MpcR4k1ItYmNYxW0S+b3TftKSpIKXfcM7ctuWeBBNjbYOhAtaP5Sw/6XrdIu+i yBNnpcVk8ZjWBAV3FRGsoMx6dmInONqGXSCdiHOq6JK8s9gpswmKjaebrTKpm4Ihi1Ob ctjmOUwfZqruaND54GRWsaLWss+qmv8gWsLdlxjgJ7vyy+qWK+IgovCzvvxLcvvcSSGU X0tpbvaESmwnuneG+ea2d4HCpgWb7zasknqA78WzrR8FSjuvbnJHCk69+z1rraHAZ3Jn bNlg== X-Gm-Message-State: ALoCoQkoRuWiaKCpLP/LRp84qOdZJsftp+30C7rsHhmnzMdjVC7gRTBUX+Gk0GFLJCPLUyAJ0BBP X-Received: by 10.43.103.136 with SMTP id di8mr4491528icc.14.1402093762399; Fri, 06 Jun 2014 15:29:22 -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 l7si751214vda.3.2014.06.06.15.29.22 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Jun 2014 15:29:22 -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 2810E5A4516; Fri, 6 Jun 2014 15:29:22 -0700 (PDT) Received: by sahlberg1.mtv.corp.google.com (Postfix, from userid 177442) id EBD25E0878; Fri, 6 Jun 2014 15:29:21 -0700 (PDT) X-Mailer: git-send-email 2.0.0.582.ge25c160 In-Reply-To: <1402093758-3162-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 tag.c to use ref transactions for all ref updates. Reviewed-by: Jonathan Nieder Signed-off-by: Ronnie Sahlberg --- builtin/tag.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/builtin/tag.c b/builtin/tag.c index c6e8a71..c9bfc9a 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -548,7 +548,6 @@ int cmd_tag(int argc, const char **argv, const char *prefix) struct strbuf ref = STRBUF_INIT; unsigned char object[20], prev[20]; const char *object_ref, *tag; - struct ref_lock *lock; struct create_tag_options opt; char *cleanup_arg = NULL; int annotate = 0, force = 0, lines = -1; @@ -556,6 +555,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix) const char *msgfile = NULL, *keyid = NULL; struct msg_arg msg = { 0, STRBUF_INIT }; struct commit_list *with_commit = NULL; + struct ref_transaction *transaction; + struct strbuf err = STRBUF_INIT; struct option options[] = { OPT_CMDMODE('l', "list", &cmdmode, N_("list tag names"), 'l'), { OPTION_INTEGER, 'n', NULL, &lines, N_("n"), @@ -701,11 +702,13 @@ int cmd_tag(int argc, const char **argv, const char *prefix) if (annotate) create_tag(object, tag, &buf, &opt, prev, object); - lock = lock_any_ref_for_update(ref.buf, prev, 0, NULL); - if (!lock) - die(_("%s: cannot lock the ref"), ref.buf); - if (write_ref_sha1(lock, object, NULL) < 0) - die(_("%s: cannot update the ref"), ref.buf); + transaction = ref_transaction_begin(&err); + if (!transaction || + ref_transaction_update(transaction, ref.buf, object, prev, + 0, !is_null_sha1(prev), &err) || + ref_transaction_commit(transaction, NULL, &err)) + die("%s", err.buf); + ref_transaction_free(transaction); if (force && !is_null_sha1(prev) && hashcmp(prev, object)) printf(_("Updated tag '%s' (was %s)\n"), tag, find_unique_abbrev(prev, DEFAULT_ABBREV)); -- 2.0.0.582.ge25c160