From patchwork Wed Mar 12 13:17:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 14013544 Received: from fout-b3-smtp.messagingengine.com (fout-b3-smtp.messagingengine.com [202.12.124.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C82ED22A1E2 for ; Wed, 12 Mar 2025 13:17:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.146 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741785465; cv=none; b=ZtkvpiowsTQC1re2GGBf6hbIU25v7DlL+v11WvGl16ltwIFPO6AxzFfFsHkevC5d1Qt9s+Bt+XRFgncRTU/wL/J+zn4fV9CX2cdIv145GhYVZ0JUvTZpPvd4xrbiRJUt/jMDbR/mwqIRGsAJopjRQeZ2wVGqlwUNG5Z5AV0T+p4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741785465; c=relaxed/simple; bh=zW07RwfWdYk0mWJtTAfc/+z+7q22KJ7dTFT3u20nJZM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Kt27T1fJehVuJwnwAmM0iQBIsqg0VR0LfVmTZJL1QL/rNjmJZ0czE5JrbAjNxjbFfXaNKtvTAK7dV3d6LXDvUgn49xWQpukth9QzJ6oFqELcYmYP6srMVXFe450SMPomZZq5ghmAYtYAM9+9HLffxLo+PzM2iNbd0z/sYQN+5tA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=B34gByeo; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=AsceL6e+; arc=none smtp.client-ip=202.12.124.146 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="B34gByeo"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="AsceL6e+" Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfout.stl.internal (Postfix) with ESMTP id DCAFD114019E; Wed, 12 Mar 2025 09:17:41 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-06.internal (MEProxy); Wed, 12 Mar 2025 09:17:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1741785461; x=1741871861; bh=1qB9FwEVOBhBF1Ne6WpXHeiBAWFvFIjJE+XejueaqE4=; b= B34gByeoMbDFJ8Cv8+vd54drjn1ipZW9XVnUoxx6SITQkne0WMKBjaFLPtaxkjBu ItxVt9lTgC/qQIQNZVjSUL0aMcdEZgOsmuLWVBh7buRpS4NyjqhP6AVJHK7SnZpz iENYCmwaTaoaFSuww1TSzWjqWiBJAi2Or4YoqTzvnQ/9MihyhQqYhnNQUvwKf5tV 213gst69LkVPnl84QYURmFgHkHIMPJx9VkAdVYrGCDp264YwibfgkcvNC6VDGA4E thYhwefR9ZAkDwZ8EZ43A2ovYPGu9iVo5F4vPc1TxD1W3ixuZUK3RMdVYO3+m+pa g5rOnoquSrEBKMqsQ+pudQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1741785461; x= 1741871861; bh=1qB9FwEVOBhBF1Ne6WpXHeiBAWFvFIjJE+XejueaqE4=; b=A sceL6e+WaEpZD14S5yeRvJH/sXhKE+JwJD4iY35I1/9lRYU3FHCEjZteUNBKsHZo yfSz2pLOpVSiqzt8SCxJYw4JXoq5UaMi6CO6mSBWDwqrz54m/R7AbYAelSdJ3X5h uW1l5AU91qejoG+kVbvZVVMyXxnqxuBye84sFlS4GH/fq89gJUQBmyfwWxZbBCKh N5HN9RHYv4/AG0iwDQ1TjJpWhawPB6yUTRMFMvA+oadvEK72cWq5lYbeDjlRDb/p gCZ/ldknZJckMfmHqiOkHW4ztVGXmBlufPECKDxTifIfXyIVpUDvL8uhW+zpyexq hVOshiUX7cvG4tSNYJELQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduvdehudejucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertder tdejnecuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhksh drihhmqeenucggtffrrghtthgvrhhnpeffueeiudejvdekheeuvdekfeffiedvueelteek udehjeetkeegvddugfdtgfeileenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehpshesphhkshdrihhmpdhnsggprhgtphhtthhopeegpdhmohgu vgepshhmthhpohhuthdprhgtphhtthhopehgihhtshhtvghrsehpohgsohigrdgtohhmpd hrtghpthhtohepkhgrrhhthhhikhdrudekkeesghhmrghilhdrtghomhdprhgtphhtthho pehphhhilhhlihhprdifohhougduvdefsehgmhgrihhlrdgtohhmpdhrtghpthhtohepgh hithesvhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 12 Mar 2025 09:17:40 -0400 (EDT) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 2950b593 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 12 Mar 2025 13:17:38 +0000 (UTC) From: Patrick Steinhardt Date: Wed, 12 Mar 2025 14:17:32 +0100 Subject: [PATCH 1/3] meson: define WITH_BREAKING_CHANGES when enabling breaking changes Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250312-b4-pks-meson-breaking-changes-v1-1-b89e9a59d228@pks.im> References: <20250312-b4-pks-meson-breaking-changes-v1-0-b89e9a59d228@pks.im> In-Reply-To: <20250312-b4-pks-meson-breaking-changes-v1-0-b89e9a59d228@pks.im> To: git@vger.kernel.org Cc: Karthik Nayak , Phillip Wood , Junio C Hamano X-Mailer: b4 0.14.2 While Meson already supports the `-Dbreaking_changes=true` option, it only wires up the build option that propagates into the tests. The build option is only used for our tests to enable the `WITH_BREAKING_CHANGES` prerequisite though, and does not influence the code that is actually being built. The omission went unnoticed because we only have tests right now that get disabled when breaking changes are enabled, but not the other way round. In other words, we don't have any tests that verify that breaking changes behave as expected. Fix the build issue by setting the `WITH_BREAKING_CHANGES` preprocessor macro when breaking changes are enabled. Note that the `libgit_c_args` array is defined after the current spot where we handle the option, so to not have multiple sites where we handle it we instead move it after the array has been defined. Based-on-patch-by: Phillip Wood Signed-off-by: Patrick Steinhardt --- meson.build | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index efe2871c9db..4ddc44f510d 100644 --- a/meson.build +++ b/meson.build @@ -672,12 +672,6 @@ build_options_config.set_quoted('GIT_TEST_UTF8_LOCALE', get_option('test_utf8_lo build_options_config.set_quoted('LOCALEDIR', fs.as_posix(get_option('prefix') / get_option('localedir'))) build_options_config.set('GITWEBDIR', fs.as_posix(get_option('prefix') / get_option('datadir') / 'gitweb')) -if get_option('breaking_changes') - build_options_config.set('WITH_BREAKING_CHANGES', 'YesPlease') -else - build_options_config.set('WITH_BREAKING_CHANGES', '') -endif - if get_option('sane_tool_path').length() != 0 sane_tool_path = (host_machine.system() == 'windows' ? ';' : ':').join(get_option('sane_tool_path')) build_options_config.set_quoted('BROKEN_PATH_FIX', 's|^\# @BROKEN_PATH_FIX@$|git_broken_path_fix "' + sane_tool_path + '"|') @@ -739,6 +733,13 @@ if get_option('warning_level') in ['2','3', 'everything'] and compiler.get_argum endforeach endif +if get_option('breaking_changes') + build_options_config.set('WITH_BREAKING_CHANGES', 'YesPlease') + libgit_c_args += '-DWITH_BREAKING_CHANGES' +else + build_options_config.set('WITH_BREAKING_CHANGES', '') +endif + if get_option('b_sanitize').contains('address') build_options_config.set('SANITIZE_ADDRESS', 'YesCompiledWithIt') else From patchwork Wed Mar 12 13:17:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 14013545 Received: from fout-b3-smtp.messagingengine.com (fout-b3-smtp.messagingengine.com [202.12.124.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 510BE245031 for ; Wed, 12 Mar 2025 13:17:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.146 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741785466; cv=none; b=Hu3rGlkPbNb1HYXMmi9WXIVG1pcCdcTvfNGeem5bPvOckuFDecoi6+hkPJP55SE5hp3VXSMDTqL+6tcPibGo3JG999SaNdzT8z339vE3hK/k4JsfgtnsiWN81aRHk/79BOpT/fPQuD9pYsCqI8X/UfNfbTTwjqM4zeZWdxDp5ec= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741785466; c=relaxed/simple; bh=m9g05zFalXartmsWlacd1hO8SNmjhv9Ptt1heIoLSac=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bV24fdcDWX/UaVXCfwpgHqzQvbxV58uWfr28BHAbE2q/k8pNJZjBBhQwkO2FLIgEVvjYiahZAWjZpqGbKhq+TtMgFfx4uGRZLZHt1ejCF6RSB5Ojxc2uOFVmKUcMZqgBYImXMDfHWm8SJnjIc3eOxZV87CViLvKLZqS1ND1JgFU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=SPC1kmF7; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=J9ntHiEi; arc=none smtp.client-ip=202.12.124.146 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="SPC1kmF7"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="J9ntHiEi" Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailfout.stl.internal (Postfix) with ESMTP id 8BA4D1140292; Wed, 12 Mar 2025 09:17:42 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-04.internal (MEProxy); Wed, 12 Mar 2025 09:17:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1741785462; x=1741871862; bh=G/+u/EvCXzVyvj8uALmsQ8++faIKpwluY6w2PHpLt0o=; b= SPC1kmF7P9xEPUL1aM5rmt4/Tk0xWeVS2bDT905yQdx+Khh42OTlOe1AePCswnR7 81Z1ay1TSoCaZ+q9A/O2swrBS8YrYLYMNM6gF2w759AV3WgilsJJUbFiy/bfiSVf mY6sG3YHQMl9osZyMLquGFduQ4X+1LG4fFKK9Qg9/1wgBiCoKk2LmlYIHCn2GZ1t lLjQU+KWRGGh9B3fppEBc6pG8yJDa/lUpIC5YVoVGSIczC9OPUgAU9H6HK8edbqf mwNDwe9a/zGCiCLFuylj1NGVvOdhQ5WSXddUm61UovVayUev88QuZSAGWHh/CQ1+ nDqx5m5yhr29ikCi0iFDtg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1741785462; x= 1741871862; bh=G/+u/EvCXzVyvj8uALmsQ8++faIKpwluY6w2PHpLt0o=; b=J 9ntHiEizG2SQ8morhZj/3TxOa3L2TDY1kFXhyMtZNEumb0y5o+TByis1w428JPxt Se/rVEtWErta1+rIVpFt0coblVUQIOXj44PODWSrYZZDsRdBTSh//mUXHqLLDq9j Rwe/ju7gZGQVvm7ytW4hptPF4Q+SexHVLs4fv4LFvoSwFJcQWvv3IfzJsaaigWbl 1UIGohefAUIHGRIemptBzHxOuPCXxZD5zGSZFaN07VWMkKJAgHLKEprkULOCq8OS hEpsr4UQYYi+674D8XzrvO42moiNApfdDUqP5q+6Ic22snQSbk6IeThsPSwsZKHF 8ib10QXPrefQ6Ctji/Xlw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduvdehudejucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertder tdejnecuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhksh drihhmqeenucggtffrrghtthgvrhhnpeffueeiudejvdekheeuvdekfeffiedvueelteek udehjeetkeegvddugfdtgfeileenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehpshesphhkshdrihhmpdhnsggprhgtphhtthhopeegpdhmohgu vgepshhmthhpohhuthdprhgtphhtthhopehphhhilhhlihhprdifohhougduvdefsehgmh grihhlrdgtohhmpdhrtghpthhtohepghhithhsthgvrhesphhosghogidrtghomhdprhgt phhtthhopehkrghrthhhihhkrddukeeksehgmhgrihhlrdgtohhmpdhrtghpthhtohepgh hithesvhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 12 Mar 2025 09:17:41 -0400 (EDT) Received: by vm-mail (OpenSMTPD) with ESMTPSA id a5892bdd (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 12 Mar 2025 13:17:39 +0000 (UTC) From: Patrick Steinhardt Date: Wed, 12 Mar 2025 14:17:33 +0100 Subject: [PATCH 2/3] meson: don't compile git-pack-redundant(1) with breaking changes Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250312-b4-pks-meson-breaking-changes-v1-2-b89e9a59d228@pks.im> References: <20250312-b4-pks-meson-breaking-changes-v1-0-b89e9a59d228@pks.im> In-Reply-To: <20250312-b4-pks-meson-breaking-changes-v1-0-b89e9a59d228@pks.im> To: git@vger.kernel.org Cc: Karthik Nayak , Phillip Wood , Junio C Hamano X-Mailer: b4 0.14.2 We continue to compile the git-pack-redundant(1) builtin with Meson when breaking changes are enabled even though we ultimately don't expose this command at all. This is mostly harmless, but given that the intent of the build option is to be as close as possible to the state where the breaking change has been fully implemented this isn't optimal either. Improve the situation by not compiling the builtin when breaking changes are enabled. Based-on-patch-by: Phillip Wood Signed-off-by: Patrick Steinhardt --- meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 4ddc44f510d..6b0eb6430af 100644 --- a/meson.build +++ b/meson.build @@ -581,7 +581,6 @@ builtin_sources = [ 'builtin/name-rev.c', 'builtin/notes.c', 'builtin/pack-objects.c', - 'builtin/pack-redundant.c', 'builtin/pack-refs.c', 'builtin/patch-id.c', 'builtin/prune-packed.c', @@ -632,6 +631,10 @@ builtin_sources = [ 'builtin/write-tree.c', ] +if not get_option('breaking_changes') + builtin_sources += 'builtin/pack-redundant.c' +endif + builtin_sources += custom_target( output: 'config-list.h', command: [ From patchwork Wed Mar 12 13:17:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 14013546 Received: from fhigh-b3-smtp.messagingengine.com (fhigh-b3-smtp.messagingengine.com [202.12.124.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 531192459D8 for ; Wed, 12 Mar 2025 13:17:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.154 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741785466; cv=none; b=Is37PqvTKZBLpLgM/W1WlabXTZdUZU76jFgqg+XC3X5yUrKnPWClwTl3TPKFri4FKNodRaeTKbD1KD5Zal8QV09jlWxzU6Q0lX33XIxVK525Xonw2jcdGUoR71JZzraE9Z+9PLcY38q3Td2XwWRMeNQJm/Ru+xa5X0ssf1DlfWQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741785466; c=relaxed/simple; bh=sa3vIU5zRaiMhBcb9OIGCV7v3PtSYM6VbT4oQkpzqys=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oCj6vQCVMeh3OU/U2srK6u/QjaIa2wF/CgwteV5uCejgJg1uqhvy3B+21QPsDm8lpvSBNMWteyCL5NlLV945DZ/zFciTBj2d0TlUqcE+PVFcH6qP0vcXVkBE842a9sJWsxE5+z/PeMGmA7yU69shBylkGLGt8aj4MptbyoWU+mk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=le2Igmxi; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=5xhcsUbJ; arc=none smtp.client-ip=202.12.124.154 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="le2Igmxi"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="5xhcsUbJ" Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfhigh.stl.internal (Postfix) with ESMTP id 62B3C254020E; Wed, 12 Mar 2025 09:17:43 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-06.internal (MEProxy); Wed, 12 Mar 2025 09:17:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1741785463; x=1741871863; bh=lTDsSOcCNpIFP/e7wqgyYZoc7tmmGsYSNOr9l8GpOaA=; b= le2IgmxiWGulr2M3nQJidtLGKMOafrI2erbONNrze3o/mTUNFnjeRLplaYBrfchB rB2sQjRpZ4M0StolSCNZluMAHbL+/WQCB47i8KhtN0XWgeRaZ0C8ElMUnkX0ktbg qx51qXGaxjherWhuvdrTzFMqBdP41jods5edXLTOtq1mihoDePLwgIp2J3LrTSER Ka8oFJ1bGM+fMszyD2OnFR6EZ4oTM2gzXvWI9KCCfstNtdtkjrCEEzhAOpFvPpxT SIhVl9lLeqbdoOKB/4eLIux/I3M7kV173x1KHWEdtnF8M1VB4VHueSo5dmW7rFHB Ld7HK3FCnzUgATnFCqWfwQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1741785463; x= 1741871863; bh=lTDsSOcCNpIFP/e7wqgyYZoc7tmmGsYSNOr9l8GpOaA=; b=5 xhcsUbJ6JojRnp+MCBD/vbg9AB2hP6yrzySIYHfrLQIC+zAYI0Qf/SR0aMNTTFC3 ciKWRvRoEdvI83LFgFuA+z7iF6fQ3uLPLqR7Ltgn3bDCaK4fasnC/ujXzQzkDQlA wV+aUIQGj4uAjVM5oSijEzv1Z+ol7IN6WIJLRgFTH72/DLgnur8yEE4Mc2o1wnTc FKMZqjPNJ7JTLkhssAdYnSA7Zh5YIaFW9K6bf3jXFAWWGmPXXdG42Q81mYRIS4Wu mQWSRDmV+A+9cvl1pR3TYhGCeTDvcsvIygnc0XG/3ffAH5gznBqjFXX7qeMOshXm VO7mZNIOhHcVwcYCfhtUg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduvdehudejucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertder tdejnecuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhksh drihhmqeenucggtffrrghtthgvrhhnpeffueeiudejvdekheeuvdekfeffiedvueelteek udehjeetkeegvddugfdtgfeileenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehpshesphhkshdrihhmpdhnsggprhgtphhtthhopeegpdhmohgu vgepshhmthhpohhuthdprhgtphhtthhopehgihhtsehvghgvrhdrkhgvrhhnvghlrdhorh hgpdhrtghpthhtohepkhgrrhhthhhikhdrudekkeesghhmrghilhdrtghomhdprhgtphht thhopehphhhilhhlihhprdifohhougduvdefsehgmhgrihhlrdgtohhmpdhrtghpthhtoh epghhithhsthgvrhesphhosghogidrtghomh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 12 Mar 2025 09:17:42 -0400 (EDT) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 46d3ff28 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 12 Mar 2025 13:17:40 +0000 (UTC) From: Patrick Steinhardt Date: Wed, 12 Mar 2025 14:17:34 +0100 Subject: [PATCH 3/3] meson: don't install git-pack-redundant(1) docs with breaking changes Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250312-b4-pks-meson-breaking-changes-v1-3-b89e9a59d228@pks.im> References: <20250312-b4-pks-meson-breaking-changes-v1-0-b89e9a59d228@pks.im> In-Reply-To: <20250312-b4-pks-meson-breaking-changes-v1-0-b89e9a59d228@pks.im> To: git@vger.kernel.org Cc: Karthik Nayak , Phillip Wood , Junio C Hamano X-Mailer: b4 0.14.2 When breaking changes are enabled we continue to install documentation of the git-pack-redundant(1) command even though it is completely disabled and thus inaccessible. Improve this by only installing the documentation in case breaking changes aren't enabled. Based-on-patch-by: Karthik Nayak Signed-off-by: Patrick Steinhardt --- Documentation/Makefile | 2 +- Documentation/meson.build | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 671267a8ac7..e6b20c021fd 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -509,7 +509,7 @@ lint-docs-meson: awk "/^manpages = {$$/ {flag=1 ; next } /^}$$/ { flag=0 } flag { gsub(/^ \047/, \"\"); gsub(/\047 : [157],\$$/, \"\"); print }" meson.build | \ grep -v -e '#' -e '^$$' | \ sort >tmp-meson-diff/meson.adoc && \ - ls git*.adoc scalar.adoc | grep -v -e git-bisect-lk2009.adoc -e git-tools.adoc >tmp-meson-diff/actual.adoc && \ + ls git*.adoc scalar.adoc | grep -v -e git-bisect-lk2009.adoc -e git-pack-redundant.adoc -e git-tools.adoc >tmp-meson-diff/actual.adoc && \ if ! cmp tmp-meson-diff/meson.adoc tmp-meson-diff/actual.adoc; then \ echo "Meson man pages differ from actual man pages:"; \ diff -u tmp-meson-diff/meson.adoc tmp-meson-diff/actual.adoc; \ diff --git a/Documentation/meson.build b/Documentation/meson.build index 594546d68b1..a2de85f5aad 100644 --- a/Documentation/meson.build +++ b/Documentation/meson.build @@ -96,7 +96,6 @@ manpages = { 'git-notes.adoc' : 1, 'git-p4.adoc' : 1, 'git-pack-objects.adoc' : 1, - 'git-pack-redundant.adoc' : 1, 'git-pack-refs.adoc' : 1, 'git-patch-id.adoc' : 1, 'git-prune-packed.adoc' : 1, @@ -205,6 +204,14 @@ manpages = { 'gitworkflows.adoc' : 7, } +manpages_breaking_changes = { + 'git-pack-redundant.adoc' : 1, +} + +if not get_option('breaking_changes') + manpages += manpages_breaking_changes +endif + docs_backend = get_option('docs_backend') if docs_backend == 'auto' if find_program('asciidoc', dirs: program_path, required: false).found() @@ -479,7 +486,9 @@ endif # Sanity check that we are not missing any tests present in 't/'. This check # only runs once at configure time and is thus best-effort, only. Furthermore, # it only verifies man pages for the sake of simplicity. -configured_manpages = manpages.keys() + [ 'git-bisect-lk2009.adoc', 'git-tools.adoc' ] +configured_manpages = manpages.keys() +configured_manpages += manpages_breaking_changes.keys() +configured_manpages += [ 'git-bisect-lk2009.adoc', 'git-tools.adoc' ] actual_manpages = run_command(shell, '-c', 'ls git*.adoc scalar.adoc', check: true, env: script_environment,