From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 804A6158043 for ; Thu, 28 Mar 2024 21:36:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E1F82BC01B; Thu, 28 Mar 2024 21:36:17 +0000 (UTC) Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E3C62E29E8 for ; Thu, 28 Mar 2024 21:36:16 +0000 (UTC) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-a450bedffdfso166684366b.3 for ; Thu, 28 Mar 2024 14:36:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711661775; x=1712266575; darn=lists.gentoo.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=PNz5d4MREj9PZZ9hZnb1Z71gUfX8/7zs6/xzOh7STHQ=; b=FUvEq9SdZI4ak6PDnJ14PVmjM6s7RRazKoyDTUH5l/6d42+c1XUOMVn/An0rk4h9M0 vTgBui+bQYE1Vi9CXiM3J4wGK/6R8EPosSGjs/KNAcA/5ILcC2VZMZJ0qCjREy9qtTfl YGSiFFctoP05436uH8arbxTKcyVG5f1yS44wTYxAxNJmkyeIJqq0lTPzqaD4Ny/oF6JE FSDUxWOBmq95j0NaOcCHzfCs4nUSjA1Jmpbwl6MvnCObDKiNyuqR4zpYzwzjR++P/pMa FP3bGty3gtRQpXP3D+tZHteC3IHKFrYd/WDK2PcbaTNbymYnxa9fkV1OL660pCYwbE51 aFeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711661775; x=1712266575; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=PNz5d4MREj9PZZ9hZnb1Z71gUfX8/7zs6/xzOh7STHQ=; b=pnZ6CA7IeezFVl8tGQ+pfTqJSA6EzTG7Rk/oLj2AmG2ZsaYiBMcb8MUqqpkg7Whepc Qi6cJ7fUknwct668bQQeAxC3MxJdidCaodmVcKKrEsRR9we9Ko8oscoTdD5Iv7oY6b1R yoiVKMSjUJjIftb/3AaCQK3YTSy3KqDQ39MgDKPvcdAE8QFwA7XvEuD7mGQmg1XevByO PTupMHX1CzFyVfUeOzuPtnaKGU1c5Ju+WDrZHDqmgSljnI6DRLSvnkETo5JS912MeH8M F/RUDKw1Qn1xLxpl6zSPIVxvZKvHqOXJUyECgUbgaD/blDwrrqIf7kh4p6/pvhKSQHYw XS6A== X-Gm-Message-State: AOJu0Yygnrby/N4FR2SWEC8Ad6/V8VgRCB39E9Um6luLspI8+ml+T+Er 41uU2xatOAC3zW5z7rdQyNj1Oj6JgXvro/3Mt6p513xrUSe+EOXpzcJGWRoC X-Google-Smtp-Source: AGHT+IG3hZYVc33WkjLsxJqmXpb7i4I32zaxaPoxpIvuUQf0cdpXJEapSBnAI7nPc4fP6PymOXJnVA== X-Received: by 2002:a17:906:6c86:b0:a4e:2acd:5bb0 with SMTP id s6-20020a1709066c8600b00a4e2acd5bb0mr288311ejr.5.1711661775356; Thu, 28 Mar 2024 14:36:15 -0700 (PDT) Received: from NeoTokyo (2001-1c08-0283-7d00-f171-43b0-54df-4736.cable.dynamic.v6.ziggo.nl. [2001:1c08:283:7d00:f171:43b0:54df:4736]) by smtp.gmail.com with ESMTPSA id z25-20020a170906271900b00a3efa4e033asm1178999ejc.151.2024.03.28.14.36.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Mar 2024 14:36:15 -0700 (PDT) Date: Thu, 28 Mar 2024 22:36:14 +0100 From: Sebastian Parborg To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH 2/2] git-r3.eclass: Add the ability to checkout ignored submodules. Message-ID: References: Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: X-Archives-Salt: d6a6feac-764c-4ea0-9b5f-ca62b2979c70 X-Archives-Hash: 089090ecb93cb4ec82772c5f4fa7bd94 If the submodules is specified in EGIT_SUBMODULES then it will ignore the "none" check. Signed-off-by: Sebastian Parborg --- eclass/git-r3.eclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass index 17b750001767..8d95d9a2b5af 100644 --- a/eclass/git-r3.eclass +++ b/eclass/git-r3.eclass @@ -429,6 +429,7 @@ _git-r3_set_submodules() { l=${l#submodule.} local subname=${l%%.url=*} + local is_manually_specified= # filter out on EGIT_SUBMODULES if declare -p EGIT_SUBMODULES &>/dev/null; then @@ -449,13 +450,14 @@ _git-r3_set_submodules() { continue else einfo "Using submodule ${parent_path}${subname}" + is_manually_specified=1 fi fi # skip modules that have 'update = none', bug #487262. local upd=$(echo "${data}" | git config -f /dev/fd/0 \ submodule."${subname}".update) - [[ ${upd} == none ]] && continue + [[ ${upd} == none && ! ${is_manually_specified} ]] && continue # https://github.com/git/git/blob/master/refs.c#L31 # we are more restrictive than git itself but that should not -- 2.43.2