From patchwork Tue Jan 9 12:17:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13514877 Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) (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 E74D8374C6 for ; Tue, 9 Jan 2024 12:17:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none 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="jhNzTK/m"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="xWCr7BJi" Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 033A05C03AF for ; Tue, 9 Jan 2024 07:17:07 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 09 Jan 2024 07:17:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc :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=fm2; t=1704802626; x=1704889026; bh=u8B2Gts39V JRNik4t75pSlaRpCTIInBcHQTFEfL6dF8=; b=jhNzTK/mPAhyFtWMDJf+QbrQpI 2BOEa6/1aiFOmQSDlEemStNXnXBUsF9+iHlcSfqMx+9meDrZba/KgloTpKBhenX+ WjV5RQM+g8zXLdBO+5gjI5JMLgeA7XudyrorZNm1vbAfakJXLNdMf7JRA8kJ0jPV 97wXB9LhWur4jGONZxma1n0s4UXBBo9D3oVIwt+NwoUByQC8cTB6xn0GHRuAo39N 35jGGzTdga4XIQwRlvTucS4tFJHGvZ3+XXQ6iLz/BaG4hL3zXxk0OUGmy7zyWPrc BGFg38Dk/BdeL7q/QmgY6F/G6b6OgHVp7IPW0c3OheidMWlzhz65j/HLgV0g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc: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-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1704802626; x=1704889026; bh=u8B2Gts39VJRNik4t75pSlaRpCTI InBcHQTFEfL6dF8=; b=xWCr7BJirhJttwYUFqVS5F9H9jPd/eHho8nR5ixU+b16 eCcF7HVsN52bFrTBWQuFGXAwpyT123bkjXNE0xrGkXWC3YLK6eaXto1ypcpdaSAH KVAz2ukP/RsMMqoHs86DCdkdANghhY3QbDHnc3OaO54J1iK13GIr8MkkDEK1x+/W RNOg+hWHiVqM+bh7iyEnP/tcglFJMErBmV7hYNjjTQVMFezn+hLB5f5pjHKDLB7T 4ghJajAIRmpSnrAKQJBd8eU+Rc4WjJ9oj7c55ViDp+w7G/ue2FcN9RZ+2sGNMCEz gGAnkiE1usXdmd+RpwqTMl/SFPFqRKRTUOKMLSYfXw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehledgfeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvuffkfhggtggujgesghdtre ertddtvdenucfhrhhomheprfgrthhrihgtkhcuufhtvghinhhhrghrughtuceophhssehp khhsrdhimheqnecuggftrfgrthhtvghrnhepheeghfdtfeeuffehkefgffduleffjedthf dvjeektdfhhedvlefgtefgvdettdfhnecuvehluhhsthgvrhfuihiivgeptdenucfrrghr rghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 9 Jan 2024 07:17:06 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 25e63ab6 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Tue, 9 Jan 2024 12:14:27 +0000 (UTC) Date: Tue, 9 Jan 2024 13:17:04 +0100 From: Patrick Steinhardt To: git@vger.kernel.org Subject: [PATCH 1/6] t1300: mark tests to require default repo format Message-ID: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: The t1300 test suite exercises the git-config(1) tool. To do so we overwrite ".git/config" to contain custom contents. While this is easy enough to do, it may create problems when using a non-default repository format because we also overwrite the repository format version as well as any potential extensions. Mark these tests with the DEFAULT_REPO_FORMAT prerequisite to avoid the problem. An alternative would be to carry over mandatory config keys into the rewritten config file. But the effort does not seem worth it given that the system under test is git-config(1), which is at a lower level than the repository format. Signed-off-by: Patrick Steinhardt --- t/t1300-config.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t1300-config.sh b/t/t1300-config.sh index f4e2752134..1e953a0fc2 100755 --- a/t/t1300-config.sh +++ b/t/t1300-config.sh @@ -1098,7 +1098,7 @@ test_expect_success SYMLINKS 'symlink to nonexistent configuration' ' test_must_fail git config --file=linktolinktonada --list ' -test_expect_success 'check split_cmdline return' " +test_expect_success DEFAULT_REPO_FORMAT 'check split_cmdline return' " git config alias.split-cmdline-fix 'echo \"' && test_must_fail git split-cmdline-fix && echo foo > foo && @@ -1156,7 +1156,7 @@ test_expect_success 'git -c works with aliases of builtins' ' test_cmp expect actual ' -test_expect_success 'aliases can be CamelCased' ' +test_expect_success DEFAULT_REPO_FORMAT 'aliases can be CamelCased' ' test_config alias.CamelCased "rev-parse HEAD" && git CamelCased >out && git rev-parse HEAD >expect && @@ -2051,7 +2051,7 @@ test_expect_success '--show-origin stdin with file include' ' test_cmp expect output ' -test_expect_success '--show-origin blob' ' +test_expect_success DEFAULT_REPO_FORMAT '--show-origin blob' ' blob=$(git hash-object -w "$CUSTOM_CONFIG_FILE") && cat >expect <<-EOF && blob:$blob user.custom=true @@ -2060,7 +2060,7 @@ test_expect_success '--show-origin blob' ' test_cmp expect output ' -test_expect_success '--show-origin blob ref' ' +test_expect_success DEFAULT_REPO_FORMAT '--show-origin blob ref' ' cat >expect <<-\EOF && blob:main:custom.conf user.custom=true EOF