[24/30] t5312: allow packed-refs v2 format

Message ID	191ad7fdef6880738c25c307bbc3c1d66b6378b5.1667846165.git.gitgitgadget@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> Message-Id: <191ad7fdef6880738c25c307bbc3c1d66b6378b5.1667846165.git.gitgitgadget@gmail.com> In-Reply-To: <pull.1408.git.1667846164.gitgitgadget@gmail.com> References: <pull.1408.git.1667846164.gitgitgadget@gmail.com> Date: Mon, 07 Nov 2022 18:35:58 +0000 Subject: [PATCH 24/30] t5312: allow packed-refs v2 format Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: jrnieder@gmail.com, Derrick Stolee <derrickstolee@github.com>, Derrick Stolee <derrickstolee@github.com> Precedence: bulk From: Derrick Stolee <derrickstolee@github.com>
Series	extensions.refFormat and packed-refs v2 file format \| expand [00/30,RFC] extensions.refFormat and packed-refs v2 file format [01/30] hashfile: allow skipping the hash function [02/30] read-cache: add index.computeHash config option [03/30] extensions: add refFormat extension [04/30] config: fix multi-level bulleted list [05/30] repository: wire ref extensions to ref backends [06/30] refs: allow loose files without packed-refs [07/30] chunk-format: number of chunks is optional [08/30] chunk-format: document trailing table of contents [09/30] chunk-format: store chunk offset during write [10/30] chunk-format: allow trailing table of contents [11/30] chunk-format: parse trailing table of contents [12/30] refs: extract packfile format to new file [13/30] packed-backend: extract add_write_error() [14/30] packed-backend: extract iterator/updates merge [15/30] packed-backend: create abstraction for writing refs [16/30] config: add config values for packed-refs v2 [17/30] packed-backend: create shell of v2 writes [18/30] packed-refs: write file format version 2 [19/30] packed-refs: read file format v2 [20/30] packed-refs: read optional prefix chunks [21/30] packed-refs: write prefix chunks [22/30] packed-backend: create GIT_TEST_PACKED_REFS_VERSION [23/30] t1409: test with packed-refs v2 [24/30] t5312: allow packed-refs v2 format [25/30] t5502: add PACKED_REFS_V1 prerequisite [26/30] t3210: require packed-refs v1 for some tests [27/30] t*: skip packed-refs v2 over http tests [28/30] ci: run GIT_TEST_PACKED_REFS_VERSION=2 in some builds [29/30] p1401: create performance test for ref operations [30/30] refs: skip hashing when writing packed-refs v2

Message ID

191ad7fdef6880738c25c307bbc3c1d66b6378b5.1667846165.git.gitgitgadget@gmail.com (mailing list archive)

State

New, archived

Headers

Message-Id: 
 <191ad7fdef6880738c25c307bbc3c1d66b6378b5.1667846165.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.1408.git.1667846164.gitgitgadget@gmail.com>
References: <pull.1408.git.1667846164.gitgitgadget@gmail.com>
Date: Mon, 07 Nov 2022 18:35:58 +0000
Subject: [PATCH 24/30] t5312: allow packed-refs v2 format
Fcc: Sent
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
To: git@vger.kernel.org
Cc: jrnieder@gmail.com, Derrick Stolee <derrickstolee@github.com>,
        Derrick Stolee <derrickstolee@github.com>
Precedence: bulk
From: Derrick Stolee <derrickstolee@github.com>

Series

extensions.refFormat and packed-refs v2 file format | expand

Commit Message

Derrick Stolee Nov. 7, 2022, 6:35 p.m. UTC

From: Derrick Stolee <derrickstolee@github.com>

One test in t5312 uses 'grep' to detect that a ref is written in the
packed-refs file instead of a loose object. This does not work when the
packed-refs file is in v2 format, such as when
GIT_TEST_PACKED_REFS_VERSION=2.

Since the test already checks that the loose ref is missing, it suffices
to check that 'git rev-parse' succeeds.

Signed-off-by: Derrick Stolee <derrickstolee@github.com>
---
 t/t3210-pack-refs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/t3210-pack-refs.sh b/t/t3210-pack-refs.sh
index 577f32dc71f..fe6c97d9087 100755
--- a/t/t3210-pack-refs.sh
+++ b/t/t3210-pack-refs.sh
@@ -159,7 +159,7 @@  test_expect_success 'delete ref while another dangling packed ref' '
 test_expect_success 'pack ref directly below refs/' '
 	git update-ref refs/top HEAD &&
 	git pack-refs --all --prune &&
-	grep refs/top .git/packed-refs &&
+	git rev-parse refs/top &&
 	test_path_is_missing .git/refs/top
 '

[24/30] t5312: allow packed-refs v2 format

Commit Message

Patch