From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ronnie Sahlberg Subject: [PATCH v11 09/41] refs.c: make update_ref_write update a strbuf on failure Date: Tue, 27 May 2014 13:25:28 -0700 Message-ID: <1401222360-21175-10-git-send-email-sahlberg@google.com> References: <1401222360-21175-1-git-send-email-sahlberg@google.com> Cc: mhagger@alum.mit.edu, Ronnie Sahlberg To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue May 27 22:27:27 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 1WpNxu-0003Vl-6v for gcvg-git-2@plane.gmane.org; Tue, 27 May 2014 22:27:18 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753478AbaE0U1K (ORCPT ); Tue, 27 May 2014 16:27:10 -0400 Received: from mail-ve0-f201.google.com ([209.85.128.201]:39580 "EHLO mail-ve0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752936AbaE0U0F (ORCPT ); Tue, 27 May 2014 16:26:05 -0400 Received: by mail-ve0-f201.google.com with SMTP id db11so1645934veb.2 for ; Tue, 27 May 2014 13:26:04 -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=Yjy8n3OBHYk0+ntio/0LMboT7TIl38IarXjobJdn9fc=; b=oQUiusW7gS0AMAR7zd5dNSd6xhrGU6Pdk+1ZarJkiHVf1bGBUTs4RcIvXIec2nsK3s TaiYsPeFKSspWGk8dPckzEfYnVgOlvBk8uejdj/sh5bbrfhLPFnYisaCtF7IDSgeLsWg SOdhYPeaKD2N8+TgFplQ5fJsVNBToJk7bQ1jHo1JXOqrro4ewP1Eh7O1K9SqNwGZLpBS 7o08WI2AA+rXxIiWxav/IBUPb/7cy8TQSZ7KV6BAF3pm/v4B6w4YJyS6DQvXgydw2ksZ 0XrXvtLRJi2YMyvoaXNkQxPp3yCqKwRxRaPbFJhTHRcTJ6AeAxcLUbxAwAVi03a5D77n Y/VQ== 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=Yjy8n3OBHYk0+ntio/0LMboT7TIl38IarXjobJdn9fc=; b=Jlkfneoacl33NIk30agHbo/ihSygl0g3dRGoYa69DYifwChE0WfdxHuH+lPflNG69Z kQfxa+2bEDlO5BviOCJI2Wo5USD9oIx+q1LQCiSsyFvPU6+yw0Baownnnb/Fqhaqeofz FoBBdVjGXcfPliQkOOGWqeCZTc69jqIOrQSo7/V/sl5NCdBNSPFPqvs495RBh9Hh8gi0 zh5/SonG1si5xJQN0Z534sUcsHVYJrb+5+3LkSawC2p1ibNGbpnNEXJcNlmy10Dm6r2B ckWnu8NAfi3atwpLK3YXbs7GJC1OLN8B7ejZS5VmSV6NMLiLWA6N2L8eAri56uj7VBrs j9yA== X-Gm-Message-State: ALoCoQmYhc2IAkIEvKOTKY70BdsPiWvE8BKfzaVJghd3bufLiNYUf82l4wyOhKMvSfhFCm9LZ/Ah X-Received: by 10.236.98.33 with SMTP id u21mr12241132yhf.39.1401222364393; Tue, 27 May 2014 13:26:04 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id c22si1395208yhe.1.2014.05.27.13.26.04 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 May 2014 13:26:04 -0700 (PDT) Received: from sahlberg1.mtv.corp.google.com (sahlberg1.mtv.corp.google.com [172.27.69.52]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 3DF76370577; Tue, 27 May 2014 13:26:04 -0700 (PDT) Received: by sahlberg1.mtv.corp.google.com (Postfix, from userid 177442) id D730BE1081; Tue, 27 May 2014 13:26:03 -0700 (PDT) X-Mailer: git-send-email 2.0.0.rc3.474.g0203784 In-Reply-To: <1401222360-21175-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 update_ref_write to also update an error strbuf on failure. This makes the error available to ref_transaction_commit callers if the transaction failed due to update_ref_sha1/write_ref_sha1 failures. Reviewed-by: Jonathan Nieder Signed-off-by: Ronnie Sahlberg --- refs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/refs.c b/refs.c index 891b80c..b28f7d4 100644 --- a/refs.c +++ b/refs.c @@ -3301,10 +3301,13 @@ static struct ref_lock *update_ref_lock(const char *refname, static int update_ref_write(const char *action, const char *refname, const unsigned char *sha1, struct ref_lock *lock, - enum action_on_err onerr) + struct strbuf *err, enum action_on_err onerr) { if (write_ref_sha1(lock, sha1, action) < 0) { const char *str = "Cannot update the ref '%s'."; + if (err) + strbuf_addf(err, str, refname); + switch (onerr) { case UPDATE_REFS_MSG_ON_ERR: error(str, refname); break; case UPDATE_REFS_DIE_ON_ERR: die(str, refname); break; @@ -3425,7 +3428,7 @@ int update_ref(const char *action, const char *refname, lock = update_ref_lock(refname, oldval, flags, NULL, onerr); if (!lock) return 1; - return update_ref_write(action, refname, sha1, lock, onerr); + return update_ref_write(action, refname, sha1, lock, NULL, onerr); } static int ref_update_compare(const void *r1, const void *r2) @@ -3507,7 +3510,7 @@ int ref_transaction_commit(struct ref_transaction *transaction, ret = update_ref_write(msg, update->refname, update->new_sha1, - update->lock, onerr); + update->lock, err, onerr); update->lock = NULL; /* freed by update_ref_write */ if (ret) goto cleanup; -- 2.0.0.rc3.474.g0203784