[22/30] packed-backend: create GIT_TEST_PACKED_REFS_VERSION

Message ID	6fe60ef2f53e680b047581eefc629144048b2224.1667846165.git.gitgitgadget@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> Message-Id: <6fe60ef2f53e680b047581eefc629144048b2224.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:56 +0000 Subject: [PATCH 22/30] packed-backend: create GIT_TEST_PACKED_REFS_VERSION 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

6fe60ef2f53e680b047581eefc629144048b2224.1667846165.git.gitgitgadget@gmail.com (mailing list archive)

State

New, archived

Headers

Message-Id: 
 <6fe60ef2f53e680b047581eefc629144048b2224.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:56 +0000
Subject: [PATCH 22/30] packed-backend: create GIT_TEST_PACKED_REFS_VERSION
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>

When set, this will create a default value for the packed-refs file
version on writes. When set to "2", it will automatically add the
"packed-v2" value to extensions.refFormat.

Not all tests pass with GIT_TEST_PACKED_REFS_VERSION=2 because they care
specifically about the content of the packed-refs file. These tests will
be updated in following changes.

To start, though, disable the GIT_TEST_PACKED_REFS_VERSION environment
variable in t3212-ref-formats.sh, since that script already tests both
versions, including upgrade scenarios.

Signed-off-by: Derrick Stolee <derrickstolee@github.com>
---
 refs/packed-backend.c  | 3 ++-
 setup.c                | 5 ++++-
 t/t3212-ref-formats.sh | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index ae904de9014..e84f669c42e 100644
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -807,7 +807,8 @@  static int write_with_updates(struct packed_ref_store *refs,
 	}
 	strbuf_release(&sb);
 
-	if (git_config_get_int("refs.packedrefsversion", &version)) {
+	if (!(version = git_env_ulong("GIT_TEST_PACKED_REFS_VERSION", 0)) &&
+	    git_config_get_int("refs.packedrefsversion", &version)) {
 		/*
 		 * Set the default depending on the current extension
 		 * list. Default to version 1 if available, but allow a
diff --git a/setup.c b/setup.c
index 72bfa289ade..a4525732fe9 100644
--- a/setup.c
+++ b/setup.c
@@ -732,8 +732,11 @@  int read_repository_format(struct repository_format *format, const char *path)
 		clear_repository_format(format);
 
 	/* Set default ref_format if no extensions.refFormat exists. */
-	if (!format->ref_format_count)
+	if (!format->ref_format_count) {
 		format->ref_format = REF_FORMAT_FILES | REF_FORMAT_PACKED;
+		if (git_env_ulong("GIT_TEST_PACKED_REFS_VERSION", 0) == 2)
+			format->ref_format |= REF_FORMAT_PACKED_V2;
+	}
 
 	return format->version;
 }
diff --git a/t/t3212-ref-formats.sh b/t/t3212-ref-formats.sh
index 571ba518ef1..5583f16db41 100755
--- a/t/t3212-ref-formats.sh
+++ b/t/t3212-ref-formats.sh
@@ -2,6 +2,9 @@ 
 
 test_description='test across ref formats'
 
+GIT_TEST_PACKED_REFS_VERSION=0
+export GIT_TEST_PACKED_REFS_VERSION
+
 . ./test-lib.sh
 
 test_expect_success 'extensions.refFormat requires core.repositoryFormatVersion=1' '

[22/30] packed-backend: create GIT_TEST_PACKED_REFS_VERSION

Commit Message

Patch