From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ronnie Sahlberg Subject: [PATCH v17 17/48] refs.c: make update_ref_write update a strbuf on failure Date: Mon, 16 Jun 2014 11:03:48 -0700 Message-ID: <1402941859-29354-18-git-send-email-sahlberg@google.com> References: <1402941859-29354-1-git-send-email-sahlberg@google.com> Cc: Ronnie Sahlberg To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Jun 16 20:07:40 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 1WwbJi-0006gH-P2 for gcvg-git-2@plane.gmane.org; Mon, 16 Jun 2014 20:07:39 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932794AbaFPSHW (ORCPT ); Mon, 16 Jun 2014 14:07:22 -0400 Received: from mail-vc0-f202.google.com ([209.85.220.202]:45943 "EHLO mail-vc0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932637AbaFPSEY (ORCPT ); Mon, 16 Jun 2014 14:04:24 -0400 Received: by mail-vc0-f202.google.com with SMTP id id10so765745vcb.1 for ; Mon, 16 Jun 2014 11:04: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=KLE6an/GfztEj4niyFP1z5tMHxhGcX01B8PpDhw1zxE=; b=FM/dxg+uvwuISriP8yKlNe5IU8Zfcip9RFpyAQlhSEUDUyGCqDTr68psnEnvXqb+me pNhiMUo9+vLfItDdxt353NziiCEcC9btXKTzgu32NJlq0FY8zGC5OIhD4h5b2euUiDxB 9U+HUhsUd6ea2cz9HFTtJ7nrZRq6Umb3H3LGfWk5Aiv8feY9x403sgz8Hwc+vE0cyvUb 6+sFuNOPcTFVJ1qtcC47tnLpRZDwK/xX/m3fYTYebnQUQfbj+8+/S4cEeyggfR+WokUc Mo/uAi3Ac0kGJ4cMnPGGSyuKO671Yf0pcYuqWFJihXNYI9YapMAY/swP6PbGaV9Q3nbr Jp1A== 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=KLE6an/GfztEj4niyFP1z5tMHxhGcX01B8PpDhw1zxE=; b=XxBu4te2vSEvb/CQHMPTiyLYLNR4XA/j+VkjoPHZlW9HY7WREh2jgkggGyTUovX2jo koMb0mR+/xngODC6st/aR6NTQi713KvYzkA3RkIiuV+L6fgxPmJBuaAjDdZpwW96gU0f o5qdIMnVO1KlZZXn0BH+w3fBQJKEL+XlQJtO35iJDD+oqebpdYaVb3bPyhOfjSdJO+KD gHpYjKo9xL5YPc7XOoMQqZHh2hfTbvY6rYWzXi+oBSavMF8FYk3oGDzkuybOV+MUSV5w TBEntgrKcgtZ2KicG94sH+XXn1YEOBwyYY73bJzcR/3u4aoOJ/lnWqzHs9ZJyR21mYIR zdjA== X-Gm-Message-State: ALoCoQm6/qzVeoLx4yxJGfneg4v4Ukh/3ZrjJLZFjk5O/k0n4Ihq2RghA5pHVDKrYEdmOLi7Zk7Q X-Received: by 10.236.165.230 with SMTP id e66mr829114yhl.6.1402941862914; Mon, 16 Jun 2014 11:04: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 z50si997792yhb.3.2014.06.16.11.04.22 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Jun 2014 11:04: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 BFDE85A4913; Mon, 16 Jun 2014 11:04:22 -0700 (PDT) Received: by sahlberg1.mtv.corp.google.com (Postfix, from userid 177442) id 9C134E0D03; Mon, 16 Jun 2014 11:04:22 -0700 (PDT) X-Mailer: git-send-email 2.0.0.282.g3799eda.dirty In-Reply-To: <1402941859-29354-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 92bad90..59992bc 100644 --- a/refs.c +++ b/refs.c @@ -3350,10 +3350,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; @@ -3474,7 +3477,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) @@ -3556,7 +3559,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.282.g3799eda.dirty