From patchwork Fri Apr 23 15:31:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Han-Wen Nienhuys X-Patchwork-Id: 12220795 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3BEEC433B4 for ; Fri, 23 Apr 2021 15:31:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 78095613B7 for ; Fri, 23 Apr 2021 15:31:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236978AbhDWPc1 (ORCPT ); Fri, 23 Apr 2021 11:32:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230294AbhDWPc1 (ORCPT ); Fri, 23 Apr 2021 11:32:27 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 656B7C06174A for ; Fri, 23 Apr 2021 08:31:50 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id s7so48726511wru.6 for ; Fri, 23 Apr 2021 08:31:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=he8jYxd5pGLBa9SivbXsw4UrQ8VucJjI2q2qnfYUPoo=; b=q6x0DErog9P7P8Y5Zh1DEQJteOQryNt1OYDWM0oYueRNUnvqyl1HMIZiCLffK1IEhO uplOvxTR55eUhCzk3zVX6YiziBBywpThLpqA2GpiB0mYMvja1pw4JyAn8mgnAKHVC3Ds 4IAYk1moo372TyAio8yZ02mqsXoyoKheqowIfty9adU2QrZZeroHI506eKazuKuvkRhi i8d3KZnsmW9zNVW16WqP46VucBlmH01ijUHukTSQ9BM9dD9WWIXS5vIC8PM1wj2gkN26 DbWiq4mlN4EJf9eyo4UHodrl8L+x/YZDwflzouDeJYXS/FlwmwJU+mK0+vF1gS8rFST4 kNdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:mime-version:content-transfer-encoding:fcc:to:cc; bh=he8jYxd5pGLBa9SivbXsw4UrQ8VucJjI2q2qnfYUPoo=; b=DUXkcHmWVgskroqUIg+w23poWE9ts882A5jRkoAA/6dBoLzCNt2WhQXEvC5TQvPHpO s8vKlm14+hvgCgzDoeehXyfZ80NtrfRhEmyYxe0r5hEgFzvt8YdFpQksKl6xW3DyJJlB rWHyM5IDF2srrl0O7msWlsIEtj9UD3gHHOWnOfYrj9B72TDKB+d0IJ1eUujqz7AsGSbS MyZKHZ7o2QRg2rGpb8kVBsUuVFMCJOnj28kBspeoCl95AZqTqp+d9fhW2cJ1u5l5NIRq 80MimZ4dBKPZsVCvOich33iz898VMsoC3GCro9Py0YMV+4OrxPaozx1pyjPQKyu5Hn6C IFGQ== X-Gm-Message-State: AOAM532sv3y4qaxdsrbUpl5Y4XBVI2WaxwqTZxVx+HYBADdrGklvNzmp mL57X/TlTh2jKKal5fYox0/EYH0PUUs= X-Google-Smtp-Source: ABdhPJyAMzAtognxEOFDc0Z7ScQgleBRjpv1v72HWU/S1W3t7CVrGTiOZO0EdM5qaOkLMRGpyN1lkg== X-Received: by 2002:adf:f303:: with SMTP id i3mr5415369wro.213.1619191909263; Fri, 23 Apr 2021 08:31:49 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c16sm9335863wrm.93.2021.04.23.08.31.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Apr 2021 08:31:48 -0700 (PDT) Message-Id: <7e8181e77d409af7595e357ad233b7781e026b78.1619191907.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Fri, 23 Apr 2021 15:31:45 +0000 Subject: [PATCH v2 1/3] refs: remove EINVAL specification from the errno sideband in read_raw_ref_fn MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Han-Wen Nienhuys , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys From: Han-Wen Nienhuys A grep for EINVAL */*c reveals that no code inspects EINVAL after reading references. The files ref backend does use EINVAL so parse_loose_ref_contents() can communicate to lock_raw_ref() about garbage following the hex SHA1, or a short read in files_read_raw_ref(), but the files backend does not call into refs_read_raw_ref(), so its EINVAL sideband error is unused. As the errno sideband is unintuitive and error-prone, remove EINVAL value, as a step towards getting rid of the errno sideband altogether. Spotted by Ævar Arnfjörð Bjarmason . Signed-off-by: Han-Wen Nienhuys --- refs/refs-internal.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/refs/refs-internal.h b/refs/refs-internal.h index 467f4b3c936d..29728a339fed 100644 --- a/refs/refs-internal.h +++ b/refs/refs-internal.h @@ -617,11 +617,10 @@ typedef int reflog_expire_fn(struct ref_store *ref_store, * properly-formatted or even safe reference name. NEITHER INPUT NOR * OUTPUT REFERENCE NAMES ARE VALIDATED WITHIN THIS FUNCTION. * - * Return 0 on success. If the ref doesn't exist, set errno to ENOENT - * and return -1. If the ref exists but is neither a symbolic ref nor - * an object ID, it is broken; set REF_ISBROKEN in type, set errno to - * EINVAL, and return -1. If there is another error reading the ref, - * set errno appropriately and return -1. + * Return 0 on success. If the ref doesn't exist, set errno to ENOENT and return + * -1. If the ref exists but is neither a symbolic ref nor an object ID, it is + * broken; set REF_ISBROKEN in type, and return -1. If there is another error + * reading the ref, set errno appropriately and return -1. * * Backend-specific flags might be set in type as well, regardless of * outcome. From patchwork Fri Apr 23 15:31:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han-Wen Nienhuys X-Patchwork-Id: 12220797 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A137C43460 for ; Fri, 23 Apr 2021 15:31:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ECE4F613C9 for ; Fri, 23 Apr 2021 15:31:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242689AbhDWPc2 (ORCPT ); Fri, 23 Apr 2021 11:32:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231748AbhDWPc1 (ORCPT ); Fri, 23 Apr 2021 11:32:27 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 303BBC061574 for ; Fri, 23 Apr 2021 08:31:51 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id y5-20020a05600c3645b0290132b13aaa3bso1452415wmq.1 for ; Fri, 23 Apr 2021 08:31:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=53/5RIkW7qI9pjwI746C+8SQCpV4VoLRFI66jslH+E0=; b=ikd/LxAGZbQ+HnSsHqfkLFUAbr29KIy6GbX/VX3v3Ncst7yhujehyvloBfDJIVtWB4 9ZXw+4ig8P8cr2nGzu2um9uoWX4Fc6u1n2rYd8ruO/ewDJXQgL4PPxdWucRVuzJYZmx/ C/LDIgqHlnhreawgBjWNjCvr+NxHLaZ5c0hYA41HVBZzU4lZv8W+aWCtC0ufZLAA2n6S iuR06bHbPgp2rjWoPB1BbSd0CVZqh9LzYYrqg0ACbpj1A5wG6tGQpym9WutWsqMp0Jep ai6Wp89BDykJ9i40MChuqOZaf5fR3eKIvjUq+MkLrOa6GpuAe/xGq8ht9WI3FMqR3Jhr XLFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=53/5RIkW7qI9pjwI746C+8SQCpV4VoLRFI66jslH+E0=; b=ToOx2wB7GrjHaOwPM5tgRCzv6kEsPMxqFFImuMZ0cQKjyywmolrgpYjdJRPcCZwLUL b2H0m6ogT54O9JDj4MRIVMAVVCDi+LlShf5e8dfpZzQP5Duvq3x+v99tgc1UbIHdp5eP A8cM7TA4wRh0ZD5rmY/DcKa8BCFCWA4+P3UdR6jWvA+EWhFjM2ZfOtbwIZHxLK2si96I wyCaDXmsJM0M3RUf6V+dgeMaBoNuIiQz4Rfyp4lkkzKbd92eYyz5P50IHYcMJhJEhcQa e1Zs5UXH7lMifMe3WoaXN0384PdphwnvuPVusuDHa+7wOTKg1F6r0teLICuOSFiBanDK 6Hrw== X-Gm-Message-State: AOAM532dre31MAzRMkHv7svesGA94QPI2pi+ucRlV5bLJTa33wn6o15N kM0PALiUSFxbwfcQjVPVL8Y+RJO97Q0= X-Google-Smtp-Source: ABdhPJyge7FVLy8ExniKaIZgLZQSdwHcLl2kXD6eH93ZnpEkQ4neUO4tl9dKvdlkmGpnHlst8H9pag== X-Received: by 2002:a05:600c:3545:: with SMTP id i5mr4714886wmq.121.1619191909819; Fri, 23 Apr 2021 08:31:49 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id t17sm7903054wmq.12.2021.04.23.08.31.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Apr 2021 08:31:49 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Fri, 23 Apr 2021 15:31:46 +0000 Subject: [PATCH v2 2/3] refs/files-backend: stop setting errno from lock_ref_oid_basic Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Han-Wen Nienhuys , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys From: Han-Wen Nienhuys Errno is a global variable written by almost all system calls, and therefore it is hard to reason about its state. This is a functional noop, because calls to lock_ref_oid_basic() in this file are followed by: * lock_ref_oid_basic (copy/rename rollback error path) * write_ref_to_lockfile (both in the rollback path and the success path of copy/rename) * create_symref_locked (files_create_symref) * refs_reflog_exists (reflog expiry) These calls do I/O and therefore clobber errno. They are not inspecting the incoming errno. Signed-off-by: Han-Wen Nienhuys --- refs/files-backend.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index 119972ee16f8..c9511da1d387 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -910,7 +910,6 @@ static int create_reflock(const char *path, void *cb) /* * Locks a ref returning the lock on success and NULL on failure. - * On failure errno is set to something meaningful. */ static struct ref_lock *lock_ref_oid_basic(struct files_ref_store *refs, const char *refname, @@ -922,7 +921,6 @@ static struct ref_lock *lock_ref_oid_basic(struct files_ref_store *refs, { struct strbuf ref_file = STRBUF_INIT; struct ref_lock *lock; - int last_errno = 0; int mustexist = (old_oid && !is_null_oid(old_oid)); int resolve_flags = RESOLVE_REF_NO_RECURSE; int resolved; @@ -949,7 +947,6 @@ static struct ref_lock *lock_ref_oid_basic(struct files_ref_store *refs, * to remain. */ if (remove_empty_directories(&ref_file)) { - last_errno = errno; if (!refs_verify_refname_available( &refs->base, refname, extras, skip, err)) @@ -962,7 +959,7 @@ static struct ref_lock *lock_ref_oid_basic(struct files_ref_store *refs, &lock->old_oid, type); } if (!resolved) { - last_errno = errno; + int last_errno = errno; if (last_errno != ENOTDIR || !refs_verify_refname_available(&refs->base, refname, extras, skip, err)) @@ -981,20 +978,17 @@ static struct ref_lock *lock_ref_oid_basic(struct files_ref_store *refs, if (is_null_oid(&lock->old_oid) && refs_verify_refname_available(refs->packed_ref_store, refname, extras, skip, err)) { - last_errno = ENOTDIR; goto error_return; } lock->ref_name = xstrdup(refname); if (raceproof_create_file(ref_file.buf, create_reflock, &lock->lk)) { - last_errno = errno; unable_to_lock_message(ref_file.buf, errno, err); goto error_return; } if (verify_lock(&refs->base, lock, old_oid, mustexist, err)) { - last_errno = errno; goto error_return; } goto out; @@ -1005,7 +999,6 @@ static struct ref_lock *lock_ref_oid_basic(struct files_ref_store *refs, out: strbuf_release(&ref_file); - errno = last_errno; return lock; } From patchwork Fri Apr 23 15:31:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han-Wen Nienhuys X-Patchwork-Id: 12220799 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01631C43461 for ; Fri, 23 Apr 2021 15:31:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C12C8611AE for ; Fri, 23 Apr 2021 15:31:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242861AbhDWPca (ORCPT ); Fri, 23 Apr 2021 11:32:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230294AbhDWPc2 (ORCPT ); Fri, 23 Apr 2021 11:32:28 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93E62C06174A for ; Fri, 23 Apr 2021 08:31:51 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id r7so36806655wrm.1 for ; Fri, 23 Apr 2021 08:31:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=F4HOaeHIO7KS1k6ttHWwH5r5xh4Z26cSAfantBfReEo=; b=YfbfU0I5I+ZnQf8s3+gSHKplQPL2SbRZOmLn6cP9zH6hbfPPMlCSOrLwuobLr5qcGt pG3cVo2qAFMqpaLibkvB/ek4fvIUSQvRvmdt/dzAe3Ysw7hZwTd8ayoZ1kQiW5r+1lDR fIkA2PDbUMe107I4z+UjBiaYLCuxHmyUuC2WJ2GFjXqfH9q+kLuEmGcPPBLFZ9P7hiMT TaYVIvlpu6iUAEISqawiec++Kl4gdqHPiNjgEyzpxNkWe9bHpccBczAWcIPPBVtRPL98 clOqixD9O0avznAFdnXahh8Lm47MCRsAisMaVQZCaKCTHxB0zyut4b2LH/z1llVgFDLs p4Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=F4HOaeHIO7KS1k6ttHWwH5r5xh4Z26cSAfantBfReEo=; b=RvGB2TUPzYOVazmNqAcGLro7LGOjdr2BPCD5PFPUqTTv8GFAwl+1O11eDoTHyM0i1B IkON+UJsGhFZLGImZCPTm/pA9q3wUtqXk1jMIxGHc2OhduhwZOyJtxqjiqGY224WQdCG KG9kRXFJ0cz9vSZ6N0ewzPwlIGtK7r5KXMuNEgeFmkSlSCDng3NUWZg2JBm92O8KQrDc fl0p5YNrltwYjWBIYDMud13mZxB0+P1d9LvmFdJ4EHKKeJQzQHXb8+SILRzscWBf8+H5 YHRy2xzdXgjKcDNudg/s/9JsXsGpT6VMQ1wixrlKxlV6Pk+uXXdwSrh1MvRGh2I3/9PD kszA== X-Gm-Message-State: AOAM530fhy0FNG0TA71CBgXOTn1+ekemTvNVMp/JbVBO+JKbLpE4esj9 GG4MlYd7WKfGxl9NcjOtcsG3x792vtc= X-Google-Smtp-Source: ABdhPJwxce8cL5JjCaHAmhYCxyw2xj0txGmMU21ccodkDh1FcQ4aAbTksB4QqKjj8/Bn73DkfL+mTg== X-Received: by 2002:a5d:6d0a:: with SMTP id e10mr5561648wrq.161.1619191910397; Fri, 23 Apr 2021 08:31:50 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u4sm12608293wml.0.2021.04.23.08.31.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Apr 2021 08:31:50 -0700 (PDT) Message-Id: <7fbc1c754f435c6d621734685ebee1bdc539c000.1619191907.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Fri, 23 Apr 2021 15:31:47 +0000 Subject: [PATCH v2 3/3] refs: make errno output explicit for read_raw_ref_fn Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Han-Wen Nienhuys , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys From: Han-Wen Nienhuys read_raw_ref_fn needs to supply a credible errno for a number of cases. These are primarily: 1) The files backend calls read_raw_ref from lock_raw_ref, and uses the resulting error codes to create/remove directories as needed. 2) ENOENT should be translated in a zero OID, optionally with REF_ISBROKEN set, returning the last successfully resolved symref. This is necessary so read_raw_ref("HEAD") on an empty repo returns refs/heads/main (or the default branch du-jour), and we know on which branch to create the first commit. Make this information flow explicit by adding a failure_errno to the signature of read_raw_ref. All errnos from the files backend are still propagated unchanged, even though inspection suggests only ENOTDIR, EISDIR and ENOENT are relevant. Signed-off-by: Han-Wen Nienhuys --- refs.c | 7 +++++-- refs/debug.c | 4 ++-- refs/files-backend.c | 17 ++++++++--------- refs/packed-backend.c | 5 +++-- refs/refs-internal.h | 9 ++++++--- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/refs.c b/refs.c index 261fd82beb98..43e2ad6b612a 100644 --- a/refs.c +++ b/refs.c @@ -1675,13 +1675,16 @@ int refs_read_raw_ref(struct ref_store *ref_store, const char *refname, struct object_id *oid, struct strbuf *referent, unsigned int *type) { + int result, failure; if (!strcmp(refname, "FETCH_HEAD") || !strcmp(refname, "MERGE_HEAD")) { return refs_read_special_head(ref_store, refname, oid, referent, type); } - return ref_store->be->read_raw_ref(ref_store, refname, oid, referent, - type); + result = ref_store->be->read_raw_ref(ref_store, refname, oid, referent, + type, &failure); + errno = failure; + return result; } /* This function needs to return a meaningful errno on failure */ diff --git a/refs/debug.c b/refs/debug.c index 922e64fa6ad9..887dbb14be6e 100644 --- a/refs/debug.c +++ b/refs/debug.c @@ -238,14 +238,14 @@ debug_ref_iterator_begin(struct ref_store *ref_store, const char *prefix, static int debug_read_raw_ref(struct ref_store *ref_store, const char *refname, struct object_id *oid, struct strbuf *referent, - unsigned int *type) + unsigned int *type, int *failure_errno) { struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store; int res = 0; oidcpy(oid, &null_oid); res = drefs->refs->be->read_raw_ref(drefs->refs, refname, oid, referent, - type); + type, failure_errno); if (res == 0) { trace_printf_key(&trace_refs, "read_raw_ref: %s: %s (=> %s) type %x: %d\n", diff --git a/refs/files-backend.c b/refs/files-backend.c index c9511da1d387..3ba3a96e1c6b 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -343,7 +343,7 @@ static struct ref_cache *get_loose_ref_cache(struct files_ref_store *refs) static int files_read_raw_ref(struct ref_store *ref_store, const char *refname, struct object_id *oid, - struct strbuf *referent, unsigned int *type) + struct strbuf *referent, unsigned int *type, int *failure_errno) { struct files_ref_store *refs = files_downcast(ref_store, REF_STORE_READ, "read_raw_ref"); @@ -354,7 +354,6 @@ static int files_read_raw_ref(struct ref_store *ref_store, struct stat st; int fd; int ret = -1; - int save_errno; int remaining_retries = 3; *type = 0; @@ -459,10 +458,9 @@ static int files_read_raw_ref(struct ref_store *ref_store, ret = parse_loose_ref_contents(buf, oid, referent, type); out: - save_errno = errno; + *failure_errno = errno; strbuf_release(&sb_path); strbuf_release(&sb_contents); - errno = save_errno; return ret; } @@ -541,6 +539,7 @@ static int lock_raw_ref(struct files_ref_store *refs, struct strbuf ref_file = STRBUF_INIT; int attempts_remaining = 3; int ret = TRANSACTION_GENERIC_ERROR; + int failure_errno = 0; assert(err); files_assert_main_repository(refs, "lock_raw_ref"); @@ -630,8 +629,8 @@ static int lock_raw_ref(struct files_ref_store *refs, */ if (files_read_raw_ref(&refs->base, refname, - &lock->old_oid, referent, type)) { - if (errno == ENOENT) { + &lock->old_oid, referent, type, &failure_errno)) { + if (failure_errno == ENOENT) { if (mustexist) { /* Garden variety missing reference. */ strbuf_addf(err, "unable to resolve reference '%s'", @@ -655,7 +654,7 @@ static int lock_raw_ref(struct files_ref_store *refs, * reference named "refs/foo/bar/baz". */ } - } else if (errno == EISDIR) { + } else if (failure_errno == EISDIR) { /* * There is a directory in the way. It might have * contained references that have been deleted. If @@ -693,13 +692,13 @@ static int lock_raw_ref(struct files_ref_store *refs, goto error_return; } } - } else if (errno == EINVAL && (*type & REF_ISBROKEN)) { + } else if (failure_errno == EINVAL && (*type & REF_ISBROKEN)) { strbuf_addf(err, "unable to resolve reference '%s': " "reference broken", refname); goto error_return; } else { strbuf_addf(err, "unable to resolve reference '%s': %s", - refname, strerror(errno)); + refname, strerror(failure_errno)); goto error_return; } diff --git a/refs/packed-backend.c b/refs/packed-backend.c index dfecdbc1db60..9a09ad7f5f29 100644 --- a/refs/packed-backend.c +++ b/refs/packed-backend.c @@ -726,7 +726,8 @@ static struct snapshot *get_snapshot(struct packed_ref_store *refs) static int packed_read_raw_ref(struct ref_store *ref_store, const char *refname, struct object_id *oid, - struct strbuf *referent, unsigned int *type) + struct strbuf *referent, unsigned int *type, + int *failure_errno) { struct packed_ref_store *refs = packed_downcast(ref_store, REF_STORE_READ, "read_raw_ref"); @@ -739,7 +740,7 @@ static int packed_read_raw_ref(struct ref_store *ref_store, if (!rec) { /* refname is not a packed reference. */ - errno = ENOENT; + *failure_errno = ENOENT; return -1; } diff --git a/refs/refs-internal.h b/refs/refs-internal.h index 29728a339fed..15cc0ddd68ab 100644 --- a/refs/refs-internal.h +++ b/refs/refs-internal.h @@ -617,9 +617,11 @@ typedef int reflog_expire_fn(struct ref_store *ref_store, * properly-formatted or even safe reference name. NEITHER INPUT NOR * OUTPUT REFERENCE NAMES ARE VALIDATED WITHIN THIS FUNCTION. * - * Return 0 on success. If the ref doesn't exist, set errno to ENOENT and return + * Return 0 on success. If the ref doesn't exist, set failure_errno to ENOENT and return * -1. If the ref exists but is neither a symbolic ref nor an object ID, it is - * broken; set REF_ISBROKEN in type, and return -1. If there is another error + * broken; set REF_ISBROKEN in type, and return -1. For the files backend, EISDIR and ENOTDIR + * may be set if the ref name is a directory + * If there is another error * reading the ref, set errno appropriately and return -1. * * Backend-specific flags might be set in type as well, regardless of @@ -636,7 +638,8 @@ typedef int reflog_expire_fn(struct ref_store *ref_store, */ typedef int read_raw_ref_fn(struct ref_store *ref_store, const char *refname, struct object_id *oid, - struct strbuf *referent, unsigned int *type); + struct strbuf *referent, unsigned int *type, + int *failure_errno); struct ref_storage_be { struct ref_storage_be *next;