From mboxrd@z Thu Jan 1 00:00:00 1970 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.8 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 EC034C07E9E for ; Tue, 6 Jul 2021 18:56:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C2E8061C6D for ; Tue, 6 Jul 2021 18:56:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231675AbhGFS6p (ORCPT ); Tue, 6 Jul 2021 14:58:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231590AbhGFS6m (ORCPT ); Tue, 6 Jul 2021 14:58:42 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 829FCC06175F for ; Tue, 6 Jul 2021 11:56:02 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id u8so156178wrq.8 for ; Tue, 06 Jul 2021 11:56:02 -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=lF7kwj9wLaUuJXktR7Qa9ZkeHf3vP7VtGSTE1BGxVew=; b=oxzqGcfNxcYw1ZdJhARHXdmNQvZOIT/i49J5SgCKYJ8U3SoJSK7GjuzfpWoS4vLxXf WUk+8HwDw/nqL89RekZUFy8C1Q0ijFzPXHASWziOF62/MF5alByE9MBXtU/YVZhTdo4p 0YGykMGMF3r295Wf52jzTjwdXPuHSYJOCisNSVgkxmwQH34k31Hz+XV5+C5BhIrcjMtR kSpJESPiNf+gZvOFxp8q31oqMpnbDDnvCgz2rnTzW5lPgDdmY3LarjUvQ1ONmZO2lmUK SPtHfN8NPUFX0YMqx+pplk+w661Eknz4vHx8iZhxW9ZSXHA/F9t+InCr6xm2tAn0Fyhq dppw== 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=lF7kwj9wLaUuJXktR7Qa9ZkeHf3vP7VtGSTE1BGxVew=; b=ODFzNz5WY+Ayzh5DDwx6X6Yg0hjnM4NIUpalBt3tYv0eeAo3/1kbo+rAm5LmiQIqCv 1bcU2EcBp+rvu4+f0N9iH5he/T2Hzmj0QcjOYqa5qskIySDCquj7L2uL0/U0HyXGn4Dl TQVWq9r/NSeqqohEeajw2S95f4nusc9oEi4ns3bfMcfvLicwrl3ODchitlCYMpybukUU FTx5R7f5OR0EmHDcWtp3ijtCM0ZA7hZPhGJVWCMAsWrHkYSEq2L6Q5JHlenTf0Jv0IoJ 9q2vgibdcrq0cfuPCm18WpbOWPTtH6zG+64E+4ES6/9KpOG+qGh9XN/K/mkZTI4cydYE a6ig== X-Gm-Message-State: AOAM532jerW60h1o7e1YTKOL8bnpyEGrRYec33KZHhY0dXS/JAVLEHx1 u+0oJ1XettiZZi77AQGXqRzeFr/5sCw= X-Google-Smtp-Source: ABdhPJwrU1CtPK338Ap8W90BnauloxWo9wbh3ZO9EM+ptlOmgQFQqaZ6rzryzNjC9Wul0OKD0p4wnw== X-Received: by 2002:a5d:68d2:: with SMTP id p18mr23298883wrw.239.1625597761113; Tue, 06 Jul 2021 11:56:01 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 204sm18632041wma.30.2021.07.06.11.56.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 11:56:00 -0700 (PDT) Message-Id: <9c933706cb09265b62213b29f4a632c8a4445de1.1625597757.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Han-Wen Nienhuys via GitGitGadget" Date: Tue, 06 Jul 2021 18:55:55 +0000 Subject: [PATCH v4 4/6] refs: add failure_errno to refs_read_raw_ref() signature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fcc: Sent To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Jonathan Tan , =?UTF-8?Q?=C3=86var_Arnfj=C3=B6r=C3=B0?= Bjarmason , Han-Wen Nienhuys , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys This lets us use the explicit errno output parameter in refs_resolve_ref_unsafe. Signed-off-by: Han-Wen Nienhuys Reviewed-By: Ævar Arnfjörð Bjarmason --- refs.c | 60 +++++++++++++++++++++++++++---------------- refs/files-backend.c | 8 +++--- refs/packed-backend.c | 7 ++--- refs/refs-internal.h | 6 ++--- 4 files changed, 49 insertions(+), 32 deletions(-) diff --git a/refs.c b/refs.c index 5e5e3af8da0..25d80e544d0 100644 --- a/refs.c +++ b/refs.c @@ -1671,34 +1671,35 @@ done: return result; } -int refs_read_raw_ref(struct ref_store *ref_store, - const char *refname, struct object_id *oid, - struct strbuf *referent, unsigned int *type) +int refs_read_raw_ref(struct ref_store *ref_store, const char *refname, + struct object_id *oid, struct strbuf *referent, + unsigned int *type, int *failure_errno) { - int result; - int failure_errno; + int ignore; + if (failure_errno) + *failure_errno = 0; + else + failure_errno = &ignore; + if (!strcmp(refname, "FETCH_HEAD") || !strcmp(refname, "MERGE_HEAD")) { return refs_read_special_head(ref_store, refname, oid, referent, type); } - failure_errno = 0; - result = ref_store->be->read_raw_ref(ref_store, refname, oid, referent, - type, &failure_errno); - if (failure_errno) - errno = failure_errno; - return result; + return ref_store->be->read_raw_ref(ref_store, refname, oid, referent, + type, failure_errno); } -/* This function needs to return a meaningful errno on failure */ -const char *refs_resolve_ref_unsafe(struct ref_store *refs, - const char *refname, - int resolve_flags, - struct object_id *oid, int *flags) +const char *refs_resolve_ref_unsafe_with_errno(struct ref_store *refs, + const char *refname, + int resolve_flags, + struct object_id *oid, + int *flags, int *failure_errno) { static struct strbuf sb_refname = STRBUF_INIT; struct object_id unused_oid; int unused_flags; + int unused_errno; int symref_count; if (!oid) @@ -1707,6 +1708,9 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs, flags = &unused_flags; *flags = 0; + if (!failure_errno) + failure_errno = &unused_errno; + *failure_errno = 0; if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) { if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) || @@ -1728,11 +1732,14 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs, for (symref_count = 0; symref_count < SYMREF_MAXDEPTH; symref_count++) { unsigned int read_flags = 0; + int read_failure = 0; - if (refs_read_raw_ref(refs, refname, - oid, &sb_refname, &read_flags)) { + if (refs_read_raw_ref(refs, refname, oid, &sb_refname, + &read_flags, &read_failure)) { *flags |= read_flags; + *failure_errno = read_failure; + /* In reading mode, refs must eventually resolve */ if (resolve_flags & RESOLVE_REF_READING) return NULL; @@ -1742,9 +1749,8 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs, * may show errors besides ENOENT if there are * similarly-named refs. */ - if (errno != ENOENT && - errno != EISDIR && - errno != ENOTDIR) + if (read_failure != ENOENT && read_failure != EISDIR && + read_failure != ENOTDIR) return NULL; oidclr(oid); @@ -1783,6 +1789,15 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs, return NULL; } +const char *refs_resolve_ref_unsafe(struct ref_store *refs, const char *refname, + int resolve_flags, struct object_id *oid, + int *flags) +{ + int ignore = 0; + return refs_resolve_ref_unsafe_with_errno(refs, refname, resolve_flags, + oid, flags, &ignore); +} + /* backend functions */ int refs_init_db(struct strbuf *err) { @@ -2244,7 +2259,8 @@ int refs_verify_refname_available(struct ref_store *refs, if (skip && string_list_has_string(skip, dirname.buf)) continue; - if (!refs_read_raw_ref(refs, dirname.buf, &oid, &referent, &type)) { + if (!refs_read_raw_ref(refs, dirname.buf, &oid, &referent, + &type, NULL)) { strbuf_addf(err, _("'%s' exists; cannot create '%s'"), dirname.buf, refname); goto cleanup; diff --git a/refs/files-backend.c b/refs/files-backend.c index f98b1be9386..f38c9703504 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -383,8 +383,8 @@ stat_ref: if (lstat(path, &st) < 0) { if (errno != ENOENT) goto out; - if (refs_read_raw_ref(refs->packed_ref_store, refname, - oid, referent, type)) { + if (refs_read_raw_ref(refs->packed_ref_store, refname, oid, + referent, type, NULL)) { errno = ENOENT; goto out; } @@ -423,8 +423,8 @@ stat_ref: * ref is supposed to be, there could still be a * packed ref: */ - if (refs_read_raw_ref(refs->packed_ref_store, refname, - oid, referent, type)) { + if (refs_read_raw_ref(refs->packed_ref_store, refname, oid, + referent, type, NULL)) { errno = EISDIR; goto out; } diff --git a/refs/packed-backend.c b/refs/packed-backend.c index a457f18e93c..530dba29788 100644 --- a/refs/packed-backend.c +++ b/refs/packed-backend.c @@ -1347,6 +1347,7 @@ int is_packed_transaction_needed(struct ref_store *ref_store, ret = 0; for (i = 0; i < transaction->nr; i++) { struct ref_update *update = transaction->updates[i]; + int failure_errno = 0; unsigned int type; struct object_id oid; @@ -1357,9 +1358,9 @@ int is_packed_transaction_needed(struct ref_store *ref_store, */ continue; - if (!refs_read_raw_ref(ref_store, update->refname, - &oid, &referent, &type) || - errno != ENOENT) { + if (!refs_read_raw_ref(ref_store, update->refname, &oid, + &referent, &type, &failure_errno) || + failure_errno != ENOENT) { /* * We have to actually delete that reference * -> this transaction is needed. diff --git a/refs/refs-internal.h b/refs/refs-internal.h index 79dfb3af484..54f57c6a2df 100644 --- a/refs/refs-internal.h +++ b/refs/refs-internal.h @@ -149,9 +149,9 @@ struct ref_update { const char refname[FLEX_ARRAY]; }; -int refs_read_raw_ref(struct ref_store *ref_store, - const char *refname, struct object_id *oid, - struct strbuf *referent, unsigned int *type); +int refs_read_raw_ref(struct ref_store *ref_store, const char *refname, + struct object_id *oid, struct strbuf *referent, + unsigned int *type, int *failure_errno); /* * Write an error to `err` and return a nonzero value iff the same -- gitgitgadget