{"thread":{"id":"66270","subject":"[PATCH 00/11] Fix inconsistent ref storage format terminology","startedAt":"2026-09-04T10:36:15Z","lastAt":"2026-09-07T10:00:56Z","messageCount":20,"participants":["Patrick Steinhardt","Karthik Nayak","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":11},"messages":[{"id":"551941","messageId":"20260904-b4-pks-unify-ref-storage-format-v1-0-08144e5004ff@pks.im","threadId":"66270","inReplyTo":null,"subject":"[PATCH 00/11] Fix inconsistent ref storage format terminology","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-09-04T10:36:01Z","receivedAt":"2026-09-04T10:36:15Z","isPatch":true,"body":"Hi,\n\nback when we gained support for reftables we of course introduced the\nability to control the reference storage format that is used by newly\ncreated repositories. This infrastructure has grown over time, and\nunfortunately without a lot of consistency:\n\n - The command line parameter to specify the ref storage format is\n called \"--ref-format=\", while the corresponding repository extension\n is called \"refStorage\".\n\n - In most cases we refer to the \"ref storage format\" in our docs, so\n calling it \"--ref-format=\" is inconsistent with them.\n\n - It is possible to override the ref storage format via an environment\n variable that is called \"GIT_REFERENCE_BACKEND\", which is not even\n remotely consistent with anything else.\n\n - There is also an \"object format\", but that format does not control\n how we store objects but rather whether we use SHA1 or SHA256.\n\nSo in summary, it's a huge mess.\n\nThis problem is about to become even worse though, as we're soon going\nto introduce an object storage extension. This extension is the\nequivalent to the ref storage extension, and of course we also want\nusers to be able to control which object storage format new repositories\nare using. But we cannot properly name that parameter without creating\neven more inconsistencies:\n\n - \"--object-format=\" would match \"--ref-format=\", but that parameter\n name is already taken to specify the hash function.\n\n - \"--object-storage=\" would be a good fit, but be inconsistent with\n \"--ref-format=\". Asking the user to execute `git init\n --ref-format=reftable --object-format=sha256 --object-storage=foo`\n just feels extremely awkward.\n\nSo this patch series aims to clean up this huge mess that we (well, to a\nlarge extent I) have created, by bringing consistency to our command\nline switches, environment variables and config options to all use \"ref\nstorage\" instead. And that also paves the way for the eventual \"object\nstorage\" switches.\n\nAs a cherry on top, this patch series also extends the \"--ref-storage=\"\nswitch to allow URIs in the form of \"files://foo/bar\" to bring it in\nline with all the other ways to specify the ref storage format that\nalready allow for URIs.\n\nThanks!\n\nPatrick\n\n---\nPatrick Steinhardt (11):\n builtin/init: rename \"--ref-format=\" to \"--ref-storage=\"\n builtin/clone: rename \"--ref-format=\" to \"--ref-storage=\"\n builtin/refs: rename \"--ref-format=\" to \"--ref-storage=\"\n builtin/submodule: rename \"--ref-format=\" to \"--ref-storage=\"\n builtin/rev-parse: rename \"--show-ref-format\" to \"--show-ref-storage\"\n help: rename \"default-ref-format\" to \"default-ref-storage\"\n refs: expose function to parse reference URIs\n setup: refactor how we configure the ref storage format\n setup: rename ref storage format environment variables\n setup: rename \"init.defaultRefFormat\" to \"init.defaultRefStorage\"\n setup: allow \"git init --ref-storage=\" to specify a payload\n\n Documentation/BreakingChanges.adoc | 2 +-\n Documentation/config/feature.adoc | 2 +-\n Documentation/config/init.adoc | 6 +-\n Documentation/git-clone.adoc | 2 +-\n Documentation/git-init.adoc | 9 +-\n Documentation/git-refs.adoc | 6 +-\n Documentation/git-rev-parse.adoc | 2 +-\n Documentation/git-submodule.adoc | 8 +-\n Documentation/git.adoc | 8 +-\n Documentation/ref-storage-format.adoc | 8 +-\n builtin/clone.c | 18 ++--\n builtin/fetch.c | 2 +-\n builtin/init-db.c | 19 ++--\n builtin/refs.c | 11 ++-\n builtin/rev-parse.c | 2 +-\n builtin/submodule--helper.c | 24 +++--\n contrib/completion/git-prompt.sh | 2 +-\n environment.h | 1 +\n git-submodule.sh | 20 ++--\n help.c | 2 +-\n refs.c | 23 +++++\n refs.h | 4 +\n setup.c | 162 ++++++++++++++++++---------------\n setup.h | 2 +-\n t/perf/p1401-ref-store-tombstones.sh | 4 +-\n t/perf/perf-lib.sh | 4 +-\n t/t0001-init.sh | 126 +++++++++++++------------\n t/t0610-reftable-basics.sh | 34 +++----\n t/t0611-reftable-httpd.sh | 2 +-\n t/t1400-update-ref.sh | 2 +-\n t/t1419-exclude-refs.sh | 16 ++--\n t/t1423-ref-backend.sh | 62 +++++++++----\n t/t1460-refs-migrate.sh | 54 +++++------\n t/t1500-rev-parse.sh | 8 +-\n t/t1900-repo-info.sh | 6 +-\n t/t5510-fetch.sh | 14 +--\n t/t5601-clone.sh | 6 +-\n t/t7424-submodule-mixed-ref-formats.sh | 30 +++---\n t/test-lib.sh | 8 +-\n 39 files changed, 407 insertions(+), 314 deletions(-)\n\n\n---\nbase-commit: 3cb9185f65410273787f74333cc027d2ea5daada\nchange-id: 20260904-b4-pks-unify-ref-storage-format-0c81fb038671\n\n"},{"id":"551942","messageId":"20260904-b4-pks-unify-ref-storage-format-v1-1-08144e5004ff@pks.im","threadId":"66270","inReplyTo":"20260904-b4-pks-unify-ref-storage-format-v1-0-08144e5004ff@pks.im","subject":"[PATCH 01/11] builtin/init: rename \"--ref-format=\" to \"--ref-storage=\"","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-09-04T10:36:02Z","receivedAt":"2026-09-04T10:36:18Z","isPatch":true,"body":"Back when we gained support for reftables we of course introduced the\nability to control the reference storage format that is used by newly\ncreated repositories. This infrastructure has grown over time, and\nunfortunately without consistency:\n\n - The command line parameter to specify the ref storage format is\n called \"--ref-format=\", while the corresponding repository extension\n is called \"refStorage\".\n\n - In most cases we refer to the \"ref storage format\" in our docs, so\n calling it \"--ref-format=\" is being inconsistent with them.\n\n - It is possible to override the ref storage format via an environment\n variable that is called \"GIT_REFERENCE_BACKEND\", which is not even\n remotely consistent with anything else.\n\n - There is also an \"object format\", but that format does not control\n how we store objects but rather whether we use SHA1 or SHA256.\n\nSo in summary, it's a huge mess.\n\nThis problem is about to become even worse though, as we're soon going\nto introduce an object storage extension. This extension is the\nequivalent to the ref storage extension, and of course we also want\nusers to be able to control which object storage format new repositories\nare using. But we cannot properly name that parameter without creating\neven more inconsistencies:\n\n - \"--object-format=\" would match \"--ref-format=\", but that parameter\n name is already taken to specify the hash function.\n\n - \"--object-storage=\" would be a good fit, but be inconsistent with\n \"--ref-format=\". Asking the user to execute `git init --ref-format=\n --object-storage=` just feels extremely awkward.\n\nInstead, this and subsequent patches will fix the mess by consistently\nreferring to the ref storage format as \"ref storage\" throughout all\noptions, environment variables and config settings. This new name much\nmore closely indicates that it is about how we store data and finally\nbrings consistency into this area. We will keep the old names working of\ncourse for the sake of backwards compatibility.\n\nStart with git-init(1).\n\nSigned-off-by: Patrick Steinhardt \n---\n Documentation/config/init.adoc | 2 +-\n Documentation/git-init.adoc | 4 ++--\n Documentation/git.adoc | 2 +-\n builtin/init-db.c | 16 ++++++++-------\n t/perf/p1401-ref-store-tombstones.sh | 4 ++--\n t/perf/perf-lib.sh | 2 +-\n t/t0001-init.sh | 24 +++++++++++------------\n t/t0610-reftable-basics.sh | 14 ++++++-------\n t/t0611-reftable-httpd.sh | 2 +-\n t/t1400-update-ref.sh | 2 +-\n t/t1423-ref-backend.sh | 6 +++---\n t/t1460-refs-migrate.sh | 36 +++++++++++++++++-----------------\n t/t1900-repo-info.sh | 6 +++---\n t/t5510-fetch.sh | 8 ++++----\n t/t7424-submodule-mixed-ref-formats.sh | 2 +-\n 15 files changed, 66 insertions(+), 64 deletions(-)\n\ndiff --git a/Documentation/config/init.adoc b/Documentation/config/init.adoc\nindex 7b4abdaf8b..9c78440192 100644\n--- a/Documentation/config/init.adoc\n+++ b/Documentation/config/init.adoc\n@@ -15,7 +15,7 @@ endif::[]\n \tthis config.\n `init.defaultRefFormat`::\n \tAllows overriding the default ref storage format for new repositories.\n-\tSee `--ref-format=` in linkgit:git-init[1]. Both the command line\n+\tSee `--ref-storage=` in linkgit:git-init[1]. Both the command line\n \toption and the `GIT_DEFAULT_REF_FORMAT` environment variable take\n \tprecedence over this config.\n \ndiff --git a/Documentation/git-init.adoc b/Documentation/git-init.adoc\nindex bab99b9b47..54cff89dfe 100644\n--- a/Documentation/git-init.adoc\n+++ b/Documentation/git-init.adoc\n@@ -11,7 +11,7 @@ SYNOPSIS\n [synopsis]\n git init [-q | --quiet] [--bare] [--template=]\n \t [--separate-git-dir ] [--object-format=]\n-\t [--ref-format=]\n+\t [--ref-storage=]\n \t [-b | --initial-branch=]\n \t [--shared[=]] []\n \n@@ -57,7 +57,7 @@ values are `sha1` and (if enabled) `sha256`. `sha1` is the default.\n +\n include::object-format-disclaimer.adoc[]\n \n-`--ref-format=`::\n+`--ref-storage=`::\n Specify the given ref storage __ for the repository. The valid values are:\n +\n include::ref-storage-format.adoc[]\ndiff --git a/Documentation/git.adoc b/Documentation/git.adoc\nindex 8a5cdd3b3d..e3260fde68 100644\n--- a/Documentation/git.adoc\n+++ b/Documentation/git.adoc\n@@ -593,7 +593,7 @@ double-quotes and respecting backslash escapes. E.g., the value\n `GIT_DEFAULT_REF_FORMAT`::\n \tIf this variable is set, the default reference backend format for new\n \trepositories will be set to this value. The default is \"files\".\n-\tSee `--ref-format` in linkgit:git-init[1].\n+\tSee `--ref-storage` in linkgit:git-init[1].\n \n `GIT_REFERENCE_BACKEND`::\n Specify which reference backend to be used along with its URI.\ndiff --git a/builtin/init-db.c b/builtin/init-db.c\nindex e96b1283b7..763ee47d21 100644\n--- a/builtin/init-db.c\n+++ b/builtin/init-db.c\n@@ -57,7 +57,7 @@ static int shared_callback(const struct option *opt, const char *arg, int unset)\n static const char *const init_db_usage[] = {\n \tN_(\"git init [-q | --quiet] [--bare] [--template=]\\n\"\n \t \" [--separate-git-dir ] [--object-format=]\\n\"\n-\t \" [--ref-format=]\\n\"\n+\t \" [--ref-storage=]\\n\"\n \t \" [-b | --initial-branch=]\\n\"\n \t \" [--shared[=]] []\"),\n \tNULL\n@@ -83,7 +83,7 @@ int cmd_init_db(int argc,\n \tunsigned int flags = 0;\n \tint bare = startup_info->force_bare_repository ? 1 : -1;\n \tconst char *object_format = NULL;\n-\tconst char *ref_format = NULL;\n+\tconst char *ref_storage = NULL;\n \tconst char *initial_branch = NULL;\n \tint hash_algo = GIT_HASH_UNKNOWN;\n \tenum ref_storage_format ref_storage_format = REF_STORAGE_FORMAT_UNKNOWN;\n@@ -109,8 +109,10 @@ int cmd_init_db(int argc,\n \t\t\t N_(\"override the name of the initial branch\")),\n \t\tOPT_STRING(0, \"object-format\", &object_format, N_(\"hash\"),\n \t\t\t N_(\"specify the hash algorithm to use\")),\n-\t\tOPT_STRING(0, \"ref-format\", &ref_format, N_(\"format\"),\n-\t\t\t N_(\"specify the reference format to use\")),\n+\t\tOPT_STRING(0, \"ref-storage\", &ref_storage, N_(\"format\"),\n+\t\t\t N_(\"specify the reference storage format to use\")),\n+\t\tOPT_STRING_F(0, \"ref-format\", &ref_storage, N_(\"format\"),\n+\t\t\t N_(\"specify the reference storage format to use\"), PARSE_OPT_HIDDEN),\n \t\tOPT_END()\n \t};\n \tint ret;\n@@ -173,10 +175,10 @@ int cmd_init_db(int argc,\n \t\t\tdie(_(\"unknown hash algorithm '%s'\"), object_format);\n \t}\n \n-\tif (ref_format) {\n-\t\tref_storage_format = ref_storage_format_by_name(ref_format);\n+\tif (ref_storage) {\n+\t\tref_storage_format = ref_storage_format_by_name(ref_storage);\n \t\tif (ref_storage_format == REF_STORAGE_FORMAT_UNKNOWN)\n-\t\t\tdie(_(\"unknown ref storage format '%s'\"), ref_format);\n+\t\t\tdie(_(\"unknown ref storage format '%s'\"), ref_storage);\n \t}\n \n \tif (init_shared_repository != -1)\ndiff --git a/t/perf/p1401-ref-store-tombstones.sh b/t/perf/p1401-ref-store-tombstones.sh\nindex 9e3d8031aa..72db3c80fc 100755\n--- a/t/perf/p1401-ref-store-tombstones.sh\n+++ b/t/perf/p1401-ref-store-tombstones.sh\n@@ -5,7 +5,7 @@ test_description=\"Tests performance of ref operations with many tombstones\"\n . ./perf-lib.sh\n \n test_expect_success \"setup\" '\n-\tgit init --ref-format=reftable repo &&\n+\tgit init --ref-storage=reftable repo &&\n \tblob=$(echo foo | git -C repo hash-object -w --stdin) &&\n \tfor i in $(test_seq 8000)\n \tdo\n@@ -24,7 +24,7 @@ test_perf \"recreate refs after mass delete\" '\n '\n \n test_expect_success \"setup asymmetric\" '\n-\tgit init --ref-format=reftable repo2 &&\n+\tgit init --ref-storage=reftable repo2 &&\n \tblob=$(echo foo | git -C repo2 hash-object -w --stdin) &&\n \tfor i in $(test_seq 8000)\n \tdo\ndiff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh\nindex 2ac007888e..50a35545a1 100644\n--- a/t/perf/perf-lib.sh\n+++ b/t/perf/perf-lib.sh\n@@ -153,7 +153,7 @@ test_perf_create_repo_from () {\n \t) &&\n \t(\n \t\tcd \"$repo\" &&\n-\t\t\"$MODERN_GIT\" init -q --ref-format=\"$refformat\" --object-format=\"$objectformat\" &&\n+\t\t\"$MODERN_GIT\" init -q --ref-storage=\"$refformat\" --object-format=\"$objectformat\" &&\n \t\ttest_perf_do_repo_symlink_config_ &&\n \t\tmv .git/hooks .git/hooks-disabled 2>/dev/null &&\n \t\tif test -f .git/index.lock\ndiff --git a/t/t0001-init.sh b/t/t0001-init.sh\nindex 5cf2e5a35a..bb3ec31097 100755\n--- a/t/t0001-init.sh\n+++ b/t/t0001-init.sh\n@@ -696,9 +696,9 @@ do\n \t\ttest_cmp expect actual\n \t'\n \n-\ttest_expect_success \"init with --ref-format=$format\" '\n+\ttest_expect_success \"init with --ref-storage=$format\" '\n \t\ttest_when_finished \"rm -rf refformat\" &&\n-\t\tgit init --ref-format=$format refformat &&\n+\t\tgit init --ref-storage=$format refformat &&\n \t\techo $format >expect &&\n \t\tgit -C refformat rev-parse --show-ref-format >actual &&\n \t\ttest_cmp expect actual\n@@ -717,9 +717,9 @@ do\n \t\ttest_cmp expect actual\n \t'\n \n-\ttest_expect_success \"--ref-format=$format overrides GIT_DEFAULT_REF_FORMAT\" '\n+\ttest_expect_success \"--ref-storage=$format overrides GIT_DEFAULT_REF_FORMAT\" '\n \t\ttest_when_finished \"rm -rf refformat\" &&\n-\t\tGIT_DEFAULT_REF_FORMAT=garbage git init --ref-format=$format refformat &&\n+\t\tGIT_DEFAULT_REF_FORMAT=garbage git init --ref-storage=$format refformat &&\n \t\techo $format >expect &&\n \t\tgit -C refformat rev-parse --show-ref-format >actual &&\n \t\ttest_cmp expect actual\n@@ -735,9 +735,9 @@ do\n \t'\n done\n \n-test_expect_success \"--ref-format= overrides GIT_DEFAULT_REF_FORMAT\" '\n+test_expect_success \"--ref-storage= overrides GIT_DEFAULT_REF_FORMAT\" '\n \ttest_when_finished \"rm -rf refformat\" &&\n-\tGIT_DEFAULT_REF_FORMAT=files git init --ref-format=reftable refformat &&\n+\tGIT_DEFAULT_REF_FORMAT=files git init --ref-storage=reftable refformat &&\n \techo reftable >expect &&\n \tgit -C refformat rev-parse --show-ref-format >actual &&\n \ttest_cmp expect actual\n@@ -791,8 +791,8 @@ for from_format in $backends\n do\n \ttest_expect_success \"re-init with same format ($from_format)\" '\n \t\ttest_when_finished \"rm -rf refformat\" &&\n-\t\tgit init --ref-format=$from_format refformat &&\n-\t\tgit init --ref-format=$from_format refformat &&\n+\t\tgit init --ref-storage=$from_format refformat &&\n+\t\tgit init --ref-storage=$from_format refformat &&\n \t\techo $from_format >expect &&\n \t\tgit -C refformat rev-parse --show-ref-format >actual &&\n \t\ttest_cmp expect actual\n@@ -807,11 +807,11 @@ do\n \n \t\ttest_expect_success \"re-init with different format fails ($from_format -> $to_format)\" '\n \t\t\ttest_when_finished \"rm -rf refformat\" &&\n-\t\t\tgit init --ref-format=$from_format refformat &&\n+\t\t\tgit init --ref-storage=$from_format refformat &&\n \t\t\tcat >expect <<-EOF &&\n \t\t\tfatal: attempt to reinitialize repository with different reference storage format\n \t\t\tEOF\n-\t\t\ttest_must_fail git init --ref-format=$to_format refformat 2>err &&\n+\t\t\ttest_must_fail git init --ref-storage=$to_format refformat 2>err &&\n \t\t\ttest_cmp expect err &&\n \t\t\techo $from_format >expect &&\n \t\t\tgit -C refformat rev-parse --show-ref-format >actual &&\n@@ -820,12 +820,12 @@ do\n \tdone\n done\n \n-test_expect_success 'init with --ref-format=garbage' '\n+test_expect_success 'init with --ref-storage=garbage' '\n \ttest_when_finished \"rm -rf refformat\" &&\n \tcat >expect <<-EOF &&\n \tfatal: unknown ref storage format ${SQ}garbage${SQ}\n \tEOF\n-\ttest_must_fail git init --ref-format=garbage refformat 2>err &&\n+\ttest_must_fail git init --ref-storage=garbage refformat 2>err &&\n \ttest_cmp expect err\n '\n \ndiff --git a/t/t0610-reftable-basics.sh b/t/t0610-reftable-basics.sh\nindex 35e98b43db..4a83e1ce56 100755\n--- a/t/t0610-reftable-basics.sh\n+++ b/t/t0610-reftable-basics.sh\n@@ -59,28 +59,28 @@ test_expect_success 'init: reinitializing reftable backend succeeds' '\n \ttest_commit -C repo A &&\n \n \tgit -C repo for-each-ref >expect &&\n-\tgit init --ref-format=reftable repo &&\n+\tgit init --ref-storage=reftable repo &&\n \tgit -C repo for-each-ref >actual &&\n \ttest_cmp expect actual\n '\n \n test_expect_success 'init: reinitializing files with reftable backend fails' '\n \ttest_when_finished \"rm -rf repo\" &&\n-\tgit init --ref-format=files repo &&\n+\tgit init --ref-storage=files repo &&\n \ttest_commit -C repo file &&\n \n \tcp repo/.git/HEAD expect &&\n-\ttest_must_fail git init --ref-format=reftable repo &&\n+\ttest_must_fail git init --ref-storage=reftable repo &&\n \ttest_cmp expect repo/.git/HEAD\n '\n \n test_expect_success 'init: reinitializing reftable with files backend fails' '\n \ttest_when_finished \"rm -rf repo\" &&\n-\tgit init --ref-format=reftable repo &&\n+\tgit init --ref-storage=reftable repo &&\n \ttest_commit -C repo file &&\n \n \tcp repo/.git/HEAD expect &&\n-\ttest_must_fail git init --ref-format=files repo &&\n+\ttest_must_fail git init --ref-storage=files repo &&\n \ttest_cmp expect repo/.git/HEAD\n '\n \n@@ -163,7 +163,7 @@ test_expect_success 'clone: can clone reftable repository' '\n \n test_expect_success 'clone: can clone reffiles into reftable repository' '\n \ttest_when_finished \"rm -rf reffiles reftable\" &&\n-\tgit init --ref-format=files reffiles &&\n+\tgit init --ref-storage=files reffiles &&\n \ttest_commit -C reffiles A &&\n \tgit clone --ref-format=reftable ./reffiles reftable &&\n \n@@ -182,7 +182,7 @@ test_expect_success 'clone: can clone reffiles into reftable repository' '\n \n test_expect_success 'clone: can clone reftable into reffiles repository' '\n \ttest_when_finished \"rm -rf reffiles reftable\" &&\n-\tgit init --ref-format=reftable reftable &&\n+\tgit init --ref-storage=reftable reftable &&\n \ttest_commit -C reftable A &&\n \tgit clone --ref-format=files ./reftable reffiles &&\n \ndiff --git a/t/t0611-reftable-httpd.sh b/t/t0611-reftable-httpd.sh\nindex 5e05b9c1f2..3f0c4acf56 100755\n--- a/t/t0611-reftable-httpd.sh\n+++ b/t/t0611-reftable-httpd.sh\n@@ -10,7 +10,7 @@ start_httpd\n REPO=\"$HTTPD_DOCUMENT_ROOT_PATH/repo\"\n \n test_expect_success 'serving ls-remote' '\n-\tgit init --ref-format=reftable -b main \"$REPO\" &&\n+\tgit init --ref-storage=reftable -b main \"$REPO\" &&\n \tcd \"$REPO\" &&\n \ttest_commit m1 &&\n \t>.git/git-daemon-export-ok &&\ndiff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh\nindex 269fdaa3ed..7cc6f2e3e8 100755\n--- a/t/t1400-update-ref.sh\n+++ b/t/t1400-update-ref.sh\n@@ -2361,7 +2361,7 @@ do\n \t'\n \n \ttest_expect_success CASE_INSENSITIVE_FS \"stdin $type batch-updates existing reference\" '\n-\t\tgit init --ref-format=reftable repo &&\n+\t\tgit init --ref-storage=reftable repo &&\n \t\ttest_when_finished \"rm -fr repo\" &&\n \t\t(\n \t\t\tcd repo &&\ndiff --git a/t/t1423-ref-backend.sh b/t/t1423-ref-backend.sh\nindex fd47d77e8e..26a3655058 100755\n--- a/t/t1423-ref-backend.sh\n+++ b/t/t1423-ref-backend.sh\n@@ -137,7 +137,7 @@ do\n \n \t\ttest_expect_success \"$method: read from $to_format backend, $dir dir\" '\n \t\t\ttest_when_finished \"rm -rf repo\" &&\n-\t\t\tgit init --ref-format=$from_format repo &&\n+\t\t\tgit init --ref-storage=$from_format repo &&\n \t\t\t(\n \t\t\t\tcd repo &&\n \t\t\t\ttest_commit 1 &&\n@@ -152,7 +152,7 @@ do\n \n \t\ttest_expect_success \"$method: write to $to_format backend, $dir dir\" '\n \t\t\ttest_when_finished \"rm -rf repo\" &&\n-\t\t\tgit init --ref-format=$from_format repo &&\n+\t\t\tgit init --ref-storage=$from_format repo &&\n \t\t\t(\n \t\t\t\tcd repo &&\n \t\t\t\ttest_commit 1 &&\n@@ -179,7 +179,7 @@ do\n \n \t\ttest_expect_success \"$method: with worktree and $to_format backend, $dir dir\" '\n \t\t\ttest_when_finished \"rm -rf repo wt\" &&\n-\t\t\tgit init --ref-format=$from_format repo &&\n+\t\t\tgit init --ref-storage=$from_format repo &&\n \t\t\t(\n \t\t\t\tcd repo &&\n \t\t\t\ttest_commit 1 &&\ndiff --git a/t/t1460-refs-migrate.sh b/t/t1460-refs-migrate.sh\nindex 8f42697143..fc04bb7c70 100755\n--- a/t/t1460-refs-migrate.sh\n+++ b/t/t1460-refs-migrate.sh\n@@ -105,7 +105,7 @@ do\n \n \t\ttest_expect_success \"$from_format: migration to same format fails\" '\n \t\t\ttest_when_finished \"rm -rf repo\" &&\n-\t\t\tgit init --ref-format=$from_format repo &&\n+\t\t\tgit init --ref-storage=$from_format repo &&\n \t\t\ttest_must_fail git -C repo refs migrate \\\n \t\t\t\t--ref-format=$from_format 2>err &&\n \t\t\tcat >expect <<-EOF &&\n@@ -116,7 +116,7 @@ do\n \n \t\ttest_expect_success \"$from_format -> $to_format: migration with worktree fails\" '\n \t\t\ttest_when_finished \"rm -rf repo\" &&\n-\t\t\tgit init --ref-format=$from_format repo &&\n+\t\t\tgit init --ref-storage=$from_format repo &&\n \t\t\tgit -C repo worktree add wt &&\n \t\t\ttest_must_fail git -C repo refs migrate \\\n \t\t\t\t--ref-format=$to_format 2>err &&\n@@ -128,20 +128,20 @@ do\n \n \t\ttest_expect_success \"$from_format -> $to_format: unborn HEAD\" '\n \t\t\ttest_when_finished \"rm -rf repo\" &&\n-\t\t\tgit init --ref-format=$from_format repo &&\n+\t\t\tgit init --ref-storage=$from_format repo &&\n \t\t\ttest_migration repo \"$to_format\"\n \t\t'\n \n \t\ttest_expect_success \"$from_format -> $to_format: single ref\" '\n \t\t\ttest_when_finished \"rm -rf repo\" &&\n-\t\t\tgit init --ref-format=$from_format repo &&\n+\t\t\tgit init --ref-storage=$from_format repo &&\n \t\t\ttest_commit -C repo initial &&\n \t\t\ttest_migration repo \"$to_format\"\n \t\t'\n \n \t\ttest_expect_success \"$from_format -> $to_format: bare repository\" '\n \t\t\ttest_when_finished \"rm -rf repo repo.git\" &&\n-\t\t\tgit init --ref-format=$from_format repo &&\n+\t\t\tgit init --ref-storage=$from_format repo &&\n \t\t\ttest_commit -C repo initial &&\n \t\t\tgit clone --ref-format=$from_format --mirror repo repo.git &&\n \t\t\ttest_migration repo.git \"$to_format\"\n@@ -149,7 +149,7 @@ do\n \n \t\ttest_expect_success \"$from_format -> $to_format: dangling symref\" '\n \t\t\ttest_when_finished \"rm -rf repo\" &&\n-\t\t\tgit init --ref-format=$from_format repo &&\n+\t\t\tgit init --ref-storage=$from_format repo &&\n \t\t\ttest_commit -C repo initial &&\n \t\t\tgit -C repo symbolic-ref BROKEN_HEAD refs/heads/nonexistent &&\n \t\t\ttest_migration repo \"$to_format\" &&\n@@ -160,7 +160,7 @@ do\n \n \t\ttest_expect_success \"$from_format -> $to_format: broken ref\" '\n \t\t\ttest_when_finished \"rm -rf repo\" &&\n-\t\t\tgit init --ref-format=$from_format repo &&\n+\t\t\tgit init --ref-storage=$from_format repo &&\n \t\t\ttest_commit -C repo initial &&\n \t\t\ttest-tool -C repo ref-store main update-ref \"\" refs/heads/broken \\\n \t\t\t\t\"$(test_oid 001)\" \"$ZERO_OID\" REF_SKIP_CREATE_REFLOG,REF_SKIP_OID_VERIFICATION &&\n@@ -172,7 +172,7 @@ do\n \n \t\ttest_expect_success \"$from_format -> $to_format: pseudo-refs\" '\n \t\t\ttest_when_finished \"rm -rf repo\" &&\n-\t\t\tgit init --ref-format=$from_format repo &&\n+\t\t\tgit init --ref-storage=$from_format repo &&\n \t\t\ttest_commit -C repo initial &&\n \t\t\tgit -C repo update-ref FOO_HEAD HEAD &&\n \t\t\ttest_migration repo \"$to_format\"\n@@ -180,7 +180,7 @@ do\n \n \t\ttest_expect_success \"$from_format -> $to_format: special refs are left alone\" '\n \t\t\ttest_when_finished \"rm -rf repo\" &&\n-\t\t\tgit init --ref-format=$from_format repo &&\n+\t\t\tgit init --ref-storage=$from_format repo &&\n \t\t\ttest_commit -C repo initial &&\n \t\t\tgit -C repo rev-parse HEAD >repo/.git/MERGE_HEAD &&\n \t\t\tgit -C repo rev-parse MERGE_HEAD &&\n@@ -190,7 +190,7 @@ do\n \n \t\ttest_expect_success \"$from_format -> $to_format: a bunch of refs\" '\n \t\t\ttest_when_finished \"rm -rf repo\" &&\n-\t\t\tgit init --ref-format=$from_format repo &&\n+\t\t\tgit init --ref-storage=$from_format repo &&\n \n \t\t\ttest_commit -C repo initial &&\n \t\t\tcat >input <<-EOF &&\n@@ -208,7 +208,7 @@ do\n \n \t\ttest_expect_success \"$from_format -> $to_format: dry-run migration does not modify repository\" '\n \t\t\ttest_when_finished \"rm -rf repo\" &&\n-\t\t\tgit init --ref-format=$from_format repo &&\n+\t\t\tgit init --ref-storage=$from_format repo &&\n \t\t\ttest_commit -C repo initial &&\n \t\t\tgit -C repo refs migrate --dry-run \\\n \t\t\t\t--ref-format=$to_format >output &&\n@@ -221,7 +221,7 @@ do\n \n \t\ttest_expect_success \"$from_format -> $to_format: reflogs of symrefs with target deleted\" '\n \t\t\ttest_when_finished \"rm -rf repo\" &&\n-\t\t\tgit init --ref-format=$from_format repo &&\n+\t\t\tgit init --ref-storage=$from_format repo &&\n \t\t\ttest_commit -C repo initial &&\n \t\t\tgit -C repo branch branch-1 HEAD &&\n \t\t\tgit -C repo symbolic-ref refs/heads/symref refs/heads/branch-1 &&\n@@ -234,7 +234,7 @@ do\n \n \t\ttest_expect_success \"$from_format -> $to_format: reflogs order is retained\" '\n \t\t\ttest_when_finished \"rm -rf repo\" &&\n-\t\t\tgit init --ref-format=$from_format repo &&\n+\t\t\tgit init --ref-storage=$from_format repo &&\n \t\t\ttest_commit --date \"100005000 +0700\" --no-tag -C repo initial &&\n \t\t\ttest_commit --date \"100003000 +0700\" --no-tag -C repo second &&\n \t\t\ttest_migration repo \"$to_format\"\n@@ -242,7 +242,7 @@ do\n \n \t\ttest_expect_success \"$from_format -> $to_format: stash is retained\" '\n \t\t\ttest_when_finished \"rm -rf repo\" &&\n-\t\t\tgit init --ref-format=$from_format repo &&\n+\t\t\tgit init --ref-storage=$from_format repo &&\n \t\t\t(\n \t\t\t\tcd repo &&\n \t\t\t\ttest_commit initial A &&\n@@ -259,7 +259,7 @@ do\n \n \t\ttest_expect_success \"$from_format -> $to_format: skip reflog with --skip-reflog\" '\n \t\t\ttest_when_finished \"rm -rf repo\" &&\n-\t\t\tgit init --ref-format=$from_format repo &&\n+\t\t\tgit init --ref-storage=$from_format repo &&\n \t\t\ttest_commit -C repo initial &&\n \t\t\t# we see that the repository contains reflogs.\n \t\t\tgit -C repo reflog --all >reflogs &&\n@@ -274,7 +274,7 @@ done\n \n test_expect_success 'multiple reftable blocks with multiple entries' '\n \ttest_when_finished \"rm -rf repo\" &&\n-\tgit init --ref-format=files repo &&\n+\tgit init --ref-storage=files repo &&\n \ttest_commit -C repo first &&\n \ttest_seq -f \"create refs/heads/ref-%d HEAD\" 5000 |\n \tgit -C repo update-ref --stdin &&\n@@ -286,7 +286,7 @@ test_expect_success 'multiple reftable blocks with multiple entries' '\n \n test_expect_success 'migrating from files format deletes backend files' '\n \ttest_when_finished \"rm -rf repo\" &&\n-\tgit init --ref-format=files repo &&\n+\tgit init --ref-storage=files repo &&\n \ttest_commit -C repo first &&\n \tgit -C repo pack-refs --all &&\n \ttest_commit -C repo second &&\n@@ -313,7 +313,7 @@ test_expect_success 'migrating from files format deletes backend files' '\n \n test_expect_success 'migrating from reftable format deletes backend files' '\n \ttest_when_finished \"rm -rf repo\" &&\n-\tgit init --ref-format=reftable repo &&\n+\tgit init --ref-storage=reftable repo &&\n \ttest_commit -C repo first &&\n \n \ttest_path_is_dir repo/.git/reftable &&\ndiff --git a/t/t1900-repo-info.sh b/t/t1900-repo-info.sh\nindex c85d390f43..db5ed71818 100755\n--- a/t/t1900-repo-info.sh\n+++ b/t/t1900-repo-info.sh\n@@ -39,10 +39,10 @@ test_repo_info () {\n }\n \n test_repo_info 'ref format files is retrieved correctly' \\\n-\t'git init --ref-format=files' 'format-files' 'references.format' 'files'\n+\t'git init --ref-storage=files' 'format-files' 'references.format' 'files'\n \n test_repo_info 'ref format reftable is retrieved correctly' \\\n-\t'git init --ref-format=reftable' 'format-reftable' 'references.format' 'reftable'\n+\t'git init --ref-storage=reftable' 'format-reftable' 'references.format' 'reftable'\n \n test_repo_info 'bare repository = false is retrieved correctly' \\\n \t'git init' 'nonbare' 'layout.bare' 'false'\n@@ -75,7 +75,7 @@ test_expect_success 'values returned in order requested' '\n \treferences.format=files\n \tlayout.bare=false\n \tEOF\n-\tgit init --ref-format=files ordered &&\n+\tgit init --ref-storage=files ordered &&\n \tgit -C ordered repo info layout.bare references.format layout.bare >actual &&\n \ttest_cmp expect actual\n '\ndiff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh\nindex a8d38d9176..1b239f4f22 100755\n--- a/t/t5510-fetch.sh\n+++ b/t/t5510-fetch.sh\n@@ -1803,7 +1803,7 @@ test_expect_success CASE_INSENSITIVE_FS,REFFILES 'existing references in a case\n test_expect_success REFFILES 'existing reference lock in repo' '\n \ttest_when_finished rm -rf base repo &&\n \t(\n-\t\tgit init --ref-format=reftable base &&\n+\t\tgit init --ref-storage=reftable base &&\n \t\tcd base &&\n \t\techo >file update &&\n \t\tgit add . &&\n@@ -1814,7 +1814,7 @@ test_expect_success REFFILES 'existing reference lock in repo' '\n \t\tgit update-ref refs/heads/branch @ &&\n \t\tcd .. &&\n \n-\t\tgit init --ref-format=files --bare repo &&\n+\t\tgit init --ref-storage=files --bare repo &&\n \t\tcd repo &&\n \t\tgit remote add origin ../base &&\n \t\ttouch refs/heads/foo.lock &&\n@@ -1857,7 +1857,7 @@ test_expect_success CASE_INSENSITIVE_FS,REFFILES 'D/F conflict on case insensiti\n test_expect_success REFFILES 'D/F conflict on case sensitive filesystem with lock' '\n \ttest_when_finished rm -rf base repo &&\n \t(\n-\t\tgit init --ref-format=reftable base &&\n+\t\tgit init --ref-storage=reftable base &&\n \t\tcd base &&\n \t\techo >file update &&\n \t\tgit add . &&\n@@ -1868,7 +1868,7 @@ test_expect_success REFFILES 'D/F conflict on case sensitive filesystem with loc\n \t\tgit update-ref refs/heads/branch @ &&\n \t\tcd .. &&\n \n-\t\tgit init --ref-format=files --bare repo &&\n+\t\tgit init --ref-storage=files --bare repo &&\n \t\tcd repo &&\n \t\tgit remote add origin ../base &&\n \t\tmkdir refs/heads/foo &&\ndiff --git a/t/t7424-submodule-mixed-ref-formats.sh b/t/t7424-submodule-mixed-ref-formats.sh\nindex 559713b607..d6ea84bb90 100755\n--- a/t/t7424-submodule-mixed-ref-formats.sh\n+++ b/t/t7424-submodule-mixed-ref-formats.sh\n@@ -31,7 +31,7 @@ test_expect_success 'add existing repository with different ref storage format'\n \t(\n \t\tcd parent &&\n \t\ttest_commit parent &&\n-\t\tgit init --ref-format=$OTHER_FORMAT submodule &&\n+\t\tgit init --ref-storage=$OTHER_FORMAT submodule &&\n \t\ttest_commit -C submodule submodule &&\n \t\tgit submodule add ./submodule\n \t)\n\n-- \n2.55.0.1007.g17ff1f9808.dirty\n\n"},{"id":"551943","messageId":"20260904-b4-pks-unify-ref-storage-format-v1-2-08144e5004ff@pks.im","threadId":"66270","inReplyTo":"20260904-b4-pks-unify-ref-storage-format-v1-0-08144e5004ff@pks.im","subject":"[PATCH 02/11] builtin/clone: rename \"--ref-format=\" to \"--ref-storage=\"","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-09-04T10:36:03Z","receivedAt":"2026-09-04T10:36:21Z","isPatch":true,"body":"With the same reasoning as for git-init(1), rename \"--ref-format=\" to\n\"--ref-storage=\" and keep the old name as an alias.\n\nSigned-off-by: Patrick Steinhardt \n---\n Documentation/git-clone.adoc | 2 +-\n builtin/clone.c | 14 ++++++++------\n t/t0610-reftable-basics.sh | 4 ++--\n t/t1460-refs-migrate.sh | 2 +-\n t/t5510-fetch.sh | 6 +++---\n t/t5601-clone.sh | 4 ++--\n t/t7424-submodule-mixed-ref-formats.sh | 4 ++--\n 7 files changed, 19 insertions(+), 17 deletions(-)\n\ndiff --git a/Documentation/git-clone.adoc b/Documentation/git-clone.adoc\nindex b6e1f8ada2..57e2bda044 100644\n--- a/Documentation/git-clone.adoc\n+++ b/Documentation/git-clone.adoc\n@@ -348,7 +348,7 @@ or `--mirror` is given)\n \tThe result is Git repository can be separated from working\n \ttree.\n \n-`--ref-format=`::\n+`--ref-storage=`::\n \n Specify the given ref storage format for the repository. The valid values are:\n +\ndiff --git a/builtin/clone.c b/builtin/clone.c\nindex 5b25cca510..63bd7b795d 100644\n--- a/builtin/clone.c\n+++ b/builtin/clone.c\n@@ -901,7 +901,7 @@ int cmd_clone(int argc,\n \tchar *option_origin = NULL;\n \tstruct string_list option_not = STRING_LIST_INIT_NODUP;\n \tconst char *real_git_dir = NULL;\n-\tconst char *ref_format = NULL;\n+\tconst char *ref_storage = NULL;\n \tconst char *option_upload_pack = \"git-upload-pack\";\n \tint option_progress = -1;\n \tint option_sparse_checkout = 0;\n@@ -981,8 +981,10 @@ int cmd_clone(int argc,\n \t\t\t N_(\"any cloned submodules will be shallow\")),\n \t\tOPT_STRING(0, \"separate-git-dir\", &real_git_dir, N_(\"gitdir\"),\n \t\t\t N_(\"separate git dir from working tree\")),\n-\t\tOPT_STRING(0, \"ref-format\", &ref_format, N_(\"format\"),\n-\t\t\t N_(\"specify the reference format to use\")),\n+\t\tOPT_STRING(0, \"ref-storage\", &ref_storage, N_(\"format\"),\n+\t\t\t N_(\"specify the reference storage format to use\")),\n+\t\tOPT_STRING_F(0, \"ref-format\", &ref_storage, N_(\"format\"),\n+\t\t\t N_(\"specify the reference storage format to use\"), PARSE_OPT_HIDDEN),\n \t\tOPT_STRING_LIST('c', \"config\", &option_config, N_(\"key=value\"),\n \t\t\t\tN_(\"set config inside the new repository\")),\n \t\tOPT_STRING_LIST(0, \"server-option\", &server_options,\n@@ -1027,10 +1029,10 @@ int cmd_clone(int argc,\n \tif (option_single_branch == -1)\n \t\toption_single_branch = deepen ? 1 : 0;\n \n-\tif (ref_format) {\n-\t\tref_storage_format = ref_storage_format_by_name(ref_format);\n+\tif (ref_storage) {\n+\t\tref_storage_format = ref_storage_format_by_name(ref_storage);\n \t\tif (ref_storage_format == REF_STORAGE_FORMAT_UNKNOWN)\n-\t\t\tdie(_(\"unknown ref storage format '%s'\"), ref_format);\n+\t\t\tdie(_(\"unknown ref storage format '%s'\"), ref_storage);\n \t}\n \n \tif (option_mirror) {\ndiff --git a/t/t0610-reftable-basics.sh b/t/t0610-reftable-basics.sh\nindex 4a83e1ce56..d367b4b787 100755\n--- a/t/t0610-reftable-basics.sh\n+++ b/t/t0610-reftable-basics.sh\n@@ -165,7 +165,7 @@ test_expect_success 'clone: can clone reffiles into reftable repository' '\n \ttest_when_finished \"rm -rf reffiles reftable\" &&\n \tgit init --ref-storage=files reffiles &&\n \ttest_commit -C reffiles A &&\n-\tgit clone --ref-format=reftable ./reffiles reftable &&\n+\tgit clone --ref-storage=reftable ./reffiles reftable &&\n \n \tgit -C reffiles rev-parse HEAD >expect &&\n \tgit -C reftable rev-parse HEAD >actual &&\n@@ -184,7 +184,7 @@ test_expect_success 'clone: can clone reftable into reffiles repository' '\n \ttest_when_finished \"rm -rf reffiles reftable\" &&\n \tgit init --ref-storage=reftable reftable &&\n \ttest_commit -C reftable A &&\n-\tgit clone --ref-format=files ./reftable reffiles &&\n+\tgit clone --ref-storage=files ./reftable reffiles &&\n \n \tgit -C reftable rev-parse HEAD >expect &&\n \tgit -C reffiles rev-parse HEAD >actual &&\ndiff --git a/t/t1460-refs-migrate.sh b/t/t1460-refs-migrate.sh\nindex fc04bb7c70..44ad24f16e 100755\n--- a/t/t1460-refs-migrate.sh\n+++ b/t/t1460-refs-migrate.sh\n@@ -143,7 +143,7 @@ do\n \t\t\ttest_when_finished \"rm -rf repo repo.git\" &&\n \t\t\tgit init --ref-storage=$from_format repo &&\n \t\t\ttest_commit -C repo initial &&\n-\t\t\tgit clone --ref-format=$from_format --mirror repo repo.git &&\n+\t\t\tgit clone --ref-storage=$from_format --mirror repo repo.git &&\n \t\t\ttest_migration repo.git \"$to_format\"\n \t\t'\n \ndiff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh\nindex 1b239f4f22..720157e6c5 100755\n--- a/t/t5510-fetch.sh\n+++ b/t/t5510-fetch.sh\n@@ -46,19 +46,19 @@ test_expect_success \"clone and setup child repos\" '\n \t) &&\n \tgit clone . bundle &&\n \tgit clone . seven &&\n-\tgit clone --ref-format=reftable . case_sensitive &&\n+\tgit clone --ref-storage=reftable . case_sensitive &&\n \t(\n \t\tcd case_sensitive &&\n \t\tgit branch branch1 &&\n \t\tgit branch bRanch1\n \t) &&\n-\tgit clone --ref-format=reftable . case_sensitive_fd &&\n+\tgit clone --ref-storage=reftable . case_sensitive_fd &&\n \t(\n \t\tcd case_sensitive_fd &&\n \t\tgit branch foo/bar &&\n \t\tgit branch Foo\n \t) &&\n-\tgit clone --ref-format=reftable . case_sensitive_df &&\n+\tgit clone --ref-storage=reftable . case_sensitive_df &&\n \t(\n \t\tcd case_sensitive_df &&\n \t\tgit branch Foo/bar &&\ndiff --git a/t/t5601-clone.sh b/t/t5601-clone.sh\nindex b6167582a1..88f359914f 100755\n--- a/t/t5601-clone.sh\n+++ b/t/t5601-clone.sh\n@@ -166,7 +166,7 @@ test_expect_success 'clone --mirror does not repeat tags' '\n \n test_expect_success 'clone with files ref format' '\n \ttest_when_finished \"rm -rf ref-storage\" &&\n-\tgit clone --ref-format=files --mirror src ref-storage &&\n+\tgit clone --ref-storage=files --mirror src ref-storage &&\n \techo files >expect &&\n \tgit -C ref-storage rev-parse --show-ref-format >actual &&\n \ttest_cmp expect actual\n@@ -176,7 +176,7 @@ test_expect_success 'clone with garbage ref format' '\n \tcat >expect <<-EOF &&\n \tfatal: unknown ref storage format ${SQ}garbage${SQ}\n \tEOF\n-\ttest_must_fail git clone --ref-format=garbage --mirror src ref-storage 2>err &&\n+\ttest_must_fail git clone --ref-storage=garbage --mirror src ref-storage 2>err &&\n \ttest_cmp expect err &&\n \ttest_path_is_missing ref-storage\n '\ndiff --git a/t/t7424-submodule-mixed-ref-formats.sh b/t/t7424-submodule-mixed-ref-formats.sh\nindex d6ea84bb90..1adac7baed 100755\n--- a/t/t7424-submodule-mixed-ref-formats.sh\n+++ b/t/t7424-submodule-mixed-ref-formats.sh\n@@ -63,9 +63,9 @@ test_expect_success 'recursive clone propagates ref storage format' '\n \ttest_ref_format upstream/submodule \"$GIT_DEFAULT_REF_FORMAT\" &&\n \n \t# The cloned repositories should use the other ref format that we have\n-\t# specified via `--ref-format`. The option should propagate to cloned\n+\t# specified via `--ref-storage`. The option should propagate to cloned\n \t# submodules.\n-\tgit clone --ref-format=$OTHER_FORMAT --recurse-submodules \\\n+\tgit clone --ref-storage=$OTHER_FORMAT --recurse-submodules \\\n \t\tupstream downstream &&\n \ttest_ref_format downstream \"$OTHER_FORMAT\" &&\n \ttest_ref_format downstream/submodule \"$OTHER_FORMAT\"\n\n-- \n2.55.0.1007.g17ff1f9808.dirty\n\n"},{"id":"551944","messageId":"20260904-b4-pks-unify-ref-storage-format-v1-3-08144e5004ff@pks.im","threadId":"66270","inReplyTo":"20260904-b4-pks-unify-ref-storage-format-v1-0-08144e5004ff@pks.im","subject":"[PATCH 03/11] builtin/refs: rename \"--ref-format=\" to \"--ref-storage=\"","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-09-04T10:36:04Z","receivedAt":"2026-09-04T10:36:22Z","isPatch":true,"body":"With the same reasoning as for git-init(1), rename \"--ref-format=\" to\n\"--ref-storage=\" and keep the old name as an alias.\n\nSigned-off-by: Patrick Steinhardt \n---\n Documentation/git-refs.adoc | 6 +++---\n builtin/fetch.c | 2 +-\n builtin/refs.c | 11 +++++++----\n t/t1423-ref-backend.sh | 8 ++++----\n t/t1460-refs-migrate.sh | 12 ++++++------\n t/t7424-submodule-mixed-ref-formats.sh | 2 +-\n 6 files changed, 22 insertions(+), 19 deletions(-)\n\ndiff --git a/Documentation/git-refs.adoc b/Documentation/git-refs.adoc\nindex 9063892651..823dbd72c0 100644\n--- a/Documentation/git-refs.adoc\n+++ b/Documentation/git-refs.adoc\n@@ -9,7 +9,7 @@ git-refs - Low-level access to refs\n SYNOPSIS\n --------\n [synopsis]\n-git refs migrate --ref-format= [--no-reflog] [--dry-run]\n+git refs migrate --ref-storage= [--no-reflog] [--dry-run]\n git refs verify [--strict] [--verbose]\n git refs list [--count=] [--shell|--perl|--python|--tcl]\n \t\t [(--sort=)...] [--format=]\n@@ -97,8 +97,8 @@ OPTIONS\n \n The following options are specific to `git refs migrate`:\n \n-`--ref-format=`::\n-\tThe ref format to migrate the ref store to. Can be one of:\n+`--ref-storage=`::\n+\tThe ref storage format to migrate the ref store to. Can be one of:\n +\n include::ref-storage-format.adoc[]\n \ndiff --git a/builtin/fetch.c b/builtin/fetch.c\nindex ab7db2be06..b7faee5125 100644\n--- a/builtin/fetch.c\n+++ b/builtin/fetch.c\n@@ -1848,7 +1848,7 @@ static void ref_transaction_rejection_handler(const char *refname,\n \t\t\t\"can either accept this as-is, in which case you won't be able to\\n\"\n \t\t\t\"store all remote references on disk. Or you can alternatively\\n\"\n \t\t\t\"migrate your repository to use the 'reftable' backend with the\\n\"\n-\t\t\t\"following command:\\n\\n git refs migrate --ref-format=reftable\\n\\n\"\n+\t\t\t\"following command:\\n\\n git refs migrate --ref-storage=reftable\\n\\n\"\n \t\t\t\"Please keep in mind that not all implementations of Git support this\\n\"\n \t\t\t\"new format yet. So if you use tools other than Git to access this\\n\"\n \t\t\t\"repository it may not be an option to migrate to reftables.\\n\"));\ndiff --git a/builtin/refs.c b/builtin/refs.c\nindex 5cd21c25fe..deb9387375 100644\n--- a/builtin/refs.c\n+++ b/builtin/refs.c\n@@ -10,7 +10,7 @@\n #include \"refs/refs-internal.h\"\n \n #define REFS_MIGRATE_USAGE \\\n-\tN_(\"git refs migrate --ref-format= [--no-reflog] [--dry-run]\")\n+\tN_(\"git refs migrate --ref-storage= [--no-reflog] [--dry-run]\")\n \n #define REFS_VERIFY_USAGE \\\n \tN_(\"git refs verify [--strict] [--verbose]\")\n@@ -44,9 +44,12 @@ static int cmd_refs_migrate(int argc, const char **argv, const char *prefix,\n \tenum ref_storage_format format;\n \tunsigned int flags = 0;\n \tstruct option options[] = {\n-\t\tOPT_STRING_F(0, \"ref-format\", &format_str, N_(\"format\"),\n-\t\t\tN_(\"specify the reference format to convert to\"),\n+\t\tOPT_STRING_F(0, \"ref-storage\", &format_str, N_(\"format\"),\n+\t\t\tN_(\"specify the reference storage format to convert to\"),\n \t\t\tPARSE_OPT_NONEG),\n+\t\tOPT_STRING_F(0, \"ref-format\", &format_str, N_(\"format\"),\n+\t\t\tN_(\"specify the reference storage format to convert to\"),\n+\t\t\tPARSE_OPT_NONEG | PARSE_OPT_HIDDEN),\n \t\tOPT_BIT(0, \"dry-run\", &flags,\n \t\t\tN_(\"perform a non-destructive dry-run\"),\n \t\t\tREPO_MIGRATE_REF_STORAGE_FORMAT_DRYRUN),\n@@ -62,7 +65,7 @@ static int cmd_refs_migrate(int argc, const char **argv, const char *prefix,\n \tif (argc)\n \t\tusage(_(\"too many arguments\"));\n \tif (!format_str)\n-\t\tusage(_(\"missing --ref-format=\"));\n+\t\tusage(_(\"missing --ref-storage=\"));\n \n \tformat = ref_storage_format_by_name(format_str);\n \tif (format == REF_STORAGE_FORMAT_UNKNOWN) {\ndiff --git a/t/t1423-ref-backend.sh b/t/t1423-ref-backend.sh\nindex 26a3655058..20545d9db8 100755\n--- a/t/t1423-ref-backend.sh\n+++ b/t/t1423-ref-backend.sh\n@@ -144,7 +144,7 @@ do\n \t\t\t\ttest_commit 2 &&\n \t\t\t\ttest_commit 3 &&\n \n-\t\t\t\tgit refs migrate --dry-run --ref-format=$to_format >out &&\n+\t\t\t\tgit refs migrate --dry-run --ref-storage=$to_format >out &&\n \t\t\t\tBACKEND_PATH=\"$dir/$(sed \"s/.* ${SQ}.git\\/\\(.*\\)${SQ}/\\1/\" out)\" &&\n \t\t\t\ttest_refs_backend . $from_format \"$to_format://$BACKEND_PATH\" \"$method\"\n \t\t\t)\n@@ -159,7 +159,7 @@ do\n \t\t\t\ttest_commit 2 &&\n \t\t\t\ttest_commit 3 &&\n \n-\t\t\t\tgit refs migrate --dry-run --ref-format=$to_format >out &&\n+\t\t\t\tgit refs migrate --dry-run --ref-storage=$to_format >out &&\n \t\t\t\tBACKEND_PATH=\"$dir/$(sed \"s/.* ${SQ}.git\\/\\(.*\\)${SQ}/\\1/\" out)\" &&\n \n \t\t\t\ttest_refs_backend . $from_format \"$to_format://$BACKEND_PATH\" \"$method\" &&\n@@ -186,7 +186,7 @@ do\n \t\t\t\ttest_commit 2 &&\n \t\t\t\ttest_commit 3 &&\n \n-\t\t\t\tgit refs migrate --dry-run --ref-format=$to_format >out &&\n+\t\t\t\tgit refs migrate --dry-run --ref-storage=$to_format >out &&\n \t\t\t\tBACKEND_PATH=\"$dir/$(sed \"s/.* ${SQ}.git\\/\\(.*\\)${SQ}/\\1/\" out)\" &&\n \n \t\t\t\trun_with_uri . \"$from_format\" \"$to_format://$BACKEND_PATH\" \\\n@@ -218,7 +218,7 @@ do\n \t\t\ttest_commit 2 &&\n \t\t\ttest_commit 3 &&\n \n-\t\t\tgit refs migrate --ref-format=$to_format &&\n+\t\t\tgit refs migrate --ref-storage=$to_format &&\n \t\t\tgit refs list >out &&\n \t\t\ttest_grep \"refs/tags/1\"\tout &&\n \t\t\ttest_grep \"refs/tags/2\"\tout &&\ndiff --git a/t/t1460-refs-migrate.sh b/t/t1460-refs-migrate.sh\nindex 44ad24f16e..4f2ff725ce 100755\n--- a/t/t1460-refs-migrate.sh\n+++ b/t/t1460-refs-migrate.sh\n@@ -42,7 +42,7 @@ test_migration () {\n \t\tprint_all_reflog_entries \"$repo\" >expect_logs\n \tfi &&\n \n-\tgit -C \"$repo\" refs migrate --ref-format=\"$format\" \"$@\" &&\n+\tgit -C \"$repo\" refs migrate --ref-storage=\"$format\" \"$@\" &&\n \n \tgit -C \"$repo\" for-each-ref --include-root-refs \\\n \t\t--format='%(refname) %(objectname) %(symref)' >actual &&\n@@ -77,7 +77,7 @@ test_expect_success \"missing ref storage format\" '\n \tgit init repo &&\n \ttest_must_fail git -C repo refs migrate 2>err &&\n \tcat >expect <<-EOF &&\n-\tusage: missing --ref-format=\n+\tusage: missing --ref-storage=\n \tEOF\n \ttest_cmp expect err\n '\n@@ -86,7 +86,7 @@ test_expect_success \"unknown ref storage format\" '\n \ttest_when_finished \"rm -rf repo\" &&\n \tgit init repo &&\n \ttest_must_fail git -C repo refs migrate \\\n-\t\t--ref-format=unknown 2>err &&\n+\t\t--ref-storage=unknown 2>err &&\n \tcat >expect <<-EOF &&\n \terror: unknown ref storage format ${SQ}unknown${SQ}\n \tEOF\n@@ -107,7 +107,7 @@ do\n \t\t\ttest_when_finished \"rm -rf repo\" &&\n \t\t\tgit init --ref-storage=$from_format repo &&\n \t\t\ttest_must_fail git -C repo refs migrate \\\n-\t\t\t\t--ref-format=$from_format 2>err &&\n+\t\t\t\t--ref-storage=$from_format 2>err &&\n \t\t\tcat >expect <<-EOF &&\n \t\t\terror: repository already uses ${SQ}$from_format${SQ} format\n \t\t\tEOF\n@@ -119,7 +119,7 @@ do\n \t\t\tgit init --ref-storage=$from_format repo &&\n \t\t\tgit -C repo worktree add wt &&\n \t\t\ttest_must_fail git -C repo refs migrate \\\n-\t\t\t\t--ref-format=$to_format 2>err &&\n+\t\t\t\t--ref-storage=$to_format 2>err &&\n \t\t\tcat >expect <<-EOF &&\n \t\t\terror: migrating repositories with worktrees is not supported yet\n \t\t\tEOF\n@@ -211,7 +211,7 @@ do\n \t\t\tgit init --ref-storage=$from_format repo &&\n \t\t\ttest_commit -C repo initial &&\n \t\t\tgit -C repo refs migrate --dry-run \\\n-\t\t\t\t--ref-format=$to_format >output &&\n+\t\t\t\t--ref-storage=$to_format >output &&\n \t\t\ttest_grep \"Finished dry-run migration of refs\" output &&\n \t\t\ttest_path_is_dir repo/.git/ref_migration.* &&\n \t\t\techo $from_format >expect &&\ndiff --git a/t/t7424-submodule-mixed-ref-formats.sh b/t/t7424-submodule-mixed-ref-formats.sh\nindex 1adac7baed..5c26fc18be 100755\n--- a/t/t7424-submodule-mixed-ref-formats.sh\n+++ b/t/t7424-submodule-mixed-ref-formats.sh\n@@ -94,7 +94,7 @@ test_expect_success 'status with mixed submodule ref storages' '\n \tgit init main &&\n \tgit -C main submodule add \"file://$(pwd)/submodule\" &&\n \tgit -C main commit -m \"add submodule\" &&\n-\tgit -C main/submodule refs migrate --ref-format=$OTHER_FORMAT &&\n+\tgit -C main/submodule refs migrate --ref-storage=$OTHER_FORMAT &&\n \n \t# The main repository should use the default ref format now, whereas\n \t# the submodule should use the other format.\n\n-- \n2.55.0.1007.g17ff1f9808.dirty\n\n"},{"id":"551945","messageId":"20260904-b4-pks-unify-ref-storage-format-v1-4-08144e5004ff@pks.im","threadId":"66270","inReplyTo":"20260904-b4-pks-unify-ref-storage-format-v1-0-08144e5004ff@pks.im","subject":"[PATCH 04/11] builtin/submodule: rename \"--ref-format=\" to \"--ref-storage=\"","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-09-04T10:36:05Z","receivedAt":"2026-09-04T10:36:24Z","isPatch":true,"body":"With the same reasoning as for git-init(1), rename \"--ref-format=\" to\n\"--ref-storage=\" and keep the old name as an alias.\n\nNote that this commit is a bit more complex compared to the others as we\nalso need to adapt the submodule helper for consistency. But overall,\nthe changes are straight-forward and in the same spirit.\n\nSigned-off-by: Patrick Steinhardt \n---\n Documentation/git-submodule.adoc | 8 ++++----\n builtin/clone.c | 2 +-\n builtin/submodule--helper.c | 24 +++++++++++++++---------\n git-submodule.sh | 20 ++++++++++----------\n t/t7424-submodule-mixed-ref-formats.sh | 6 +++---\n 5 files changed, 33 insertions(+), 27 deletions(-)\n\ndiff --git a/Documentation/git-submodule.adoc b/Documentation/git-submodule.adoc\nindex 722d827908..a3713709b1 100644\n--- a/Documentation/git-submodule.adoc\n+++ b/Documentation/git-submodule.adoc\n@@ -34,7 +34,7 @@ COMMANDS\n With no arguments, shows the status of existing submodules. Several\n subcommands are available to perform operations on the submodules.\n \n-`add [-b ] [-f | --force] [--name ] [--reference ] [--ref-format ] [--depth ] [--] []`::\n+`add [-b ] [-f | --force] [--name ] [--reference ] [--ref-storage ] [--depth ] [--] []`::\n \tAdd the given repository as a submodule at the given path\n \tto the changeset to be committed next to the current\n \tproject: the current project is termed the \"superproject\".\n@@ -72,7 +72,7 @@ location, and only the superproject's URL needs to be provided.\n git-submodule will correctly locate the submodule using the relative\n URL in `.gitmodules`.\n +\n-If `--ref-format ` is specified, the ref storage format of newly\n+If `--ref-storage ` is specified, the ref storage format of newly\n cloned submodules will be set accordingly.\n \n `status [--cached] [--recursive] [--] [...]`::\n@@ -139,7 +139,7 @@ If you really want to remove a submodule from the repository and commit\n that use linkgit:git-rm[1] instead. See linkgit:gitsubmodules[7] for removal\n options.\n \n-`update [--init] [--remote] [-N | --no-fetch] [--[no-]recommend-shallow] [-f | --force] [--checkout | --rebase | --merge] [--reference=] [--ref-format=] [--depth=] [--recursive] [--jobs ] [--[no-]single-branch] [--filter=] [--] [...]`::\n+`update [--init] [--remote] [-N | --no-fetch] [--[no-]recommend-shallow] [-f | --force] [--checkout | --rebase | --merge] [--reference=] [--ref-storage=] [--depth=] [--recursive] [--jobs ] [--[no-]single-branch] [--filter=] [--] [...]`::\n +\n --\n Update the registered submodules to match what the superproject\n@@ -188,7 +188,7 @@ submodule with the `--init` option.\n If `--recursive` is specified, this command will recurse into the\n registered submodules, and update any nested submodules within.\n \n-If `--ref-format ` is specified, the ref storage format of newly\n+If `--ref-storage ` is specified, the ref storage format of newly\n cloned submodules will be set accordingly.\n \n If `--filter ` is specified, the given partial clone filter will be\ndiff --git a/builtin/clone.c b/builtin/clone.c\nindex 63bd7b795d..c4f9dc7472 100644\n--- a/builtin/clone.c\n+++ b/builtin/clone.c\n@@ -725,7 +725,7 @@ static int checkout(int submodule_progress,\n \t\t}\n \n \t\tif (ref_storage_format != REF_STORAGE_FORMAT_UNKNOWN)\n-\t\t\tstrvec_pushf(&cmd.args, \"--ref-format=%s\",\n+\t\t\tstrvec_pushf(&cmd.args, \"--ref-storage=%s\",\n \t\t\t\t ref_storage_format_to_name(ref_storage_format));\n \n \t\tif (filter_submodules && filter_options->choice)\ndiff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c\nindex e7cd3225fa..50bc4aeb4d 100644\n--- a/builtin/submodule--helper.c\n+++ b/builtin/submodule--helper.c\n@@ -1941,7 +1941,7 @@ static int clone_submodule(const struct module_clone_data *clone_data,\n \t\t\t\t\t item->string, NULL);\n \t\t}\n \t\tif (clone_data->ref_storage_format != REF_STORAGE_FORMAT_UNKNOWN)\n-\t\t\tstrvec_pushf(&cp.args, \"--ref-format=%s\",\n+\t\t\tstrvec_pushf(&cp.args, \"--ref-storage=%s\",\n \t\t\t\t ref_storage_format_to_name(clone_data->ref_storage_format));\n \t\tif (clone_data->dissociate)\n \t\t\tstrvec_push(&cp.args, \"--dissociate\");\n@@ -2057,8 +2057,10 @@ static int module_clone(int argc, const char **argv, const char *prefix,\n \t\tOPT_STRING_LIST(0, \"reference\", &reference,\n \t\t\t N_(\"repo\"),\n \t\t\t N_(\"reference repository\")),\n-\t\tOPT_STRING(0, \"ref-format\", &ref_storage_format, N_(\"format\"),\n-\t\t\t N_(\"specify the reference format to use\")),\n+\t\tOPT_STRING(0, \"ref-storage\", &ref_storage_format, N_(\"format\"),\n+\t\t\t N_(\"specify the reference storage format to use\")),\n+\t\tOPT_STRING_F(0, \"ref-format\", &ref_storage_format, N_(\"format\"),\n+\t\t\t N_(\"specify the reference storage format to use\"), PARSE_OPT_HIDDEN),\n \t\tOPT_BOOL(0, \"dissociate\", &dissociate,\n \t\t\t N_(\"use --reference only while cloning\")),\n \t\tOPT_INTEGER(0, \"depth\", &clone_data.depth,\n@@ -2357,7 +2359,7 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,\n \tif (suc->update_data->require_init)\n \t\tstrvec_push(&child->args, \"--require-init\");\n \tif (suc->update_data->ref_storage_format != REF_STORAGE_FORMAT_UNKNOWN)\n-\t\tstrvec_pushf(&child->args, \"--ref-format=%s\",\n+\t\tstrvec_pushf(&child->args, \"--ref-storage=%s\",\n \t\t\t ref_storage_format_to_name(suc->update_data->ref_storage_format));\n \tstrvec_pushl(&child->args, \"--path\", sub->path, NULL);\n \tstrvec_pushl(&child->args, \"--name\", sub->name, NULL);\n@@ -2801,7 +2803,7 @@ static void update_data_to_args(const struct update_data *update_data,\n \t\t\tstrvec_pushl(args, \"--reference\", item->string, NULL);\n \t}\n \tif (update_data->ref_storage_format != REF_STORAGE_FORMAT_UNKNOWN)\n-\t\tstrvec_pushf(args, \"--ref-format=%s\",\n+\t\tstrvec_pushf(args, \"--ref-storage=%s\",\n \t\t\t ref_storage_format_to_name(update_data->ref_storage_format));\n \tif (update_data->filter_options && update_data->filter_options->choice)\n \t\tstrvec_pushf(args, \"--filter=%s\",\n@@ -3010,8 +3012,10 @@ static int module_update(int argc, const char **argv, const char *prefix,\n \t\t\tSM_UPDATE_REBASE),\n \t\tOPT_STRING_LIST(0, \"reference\", &opt.references, N_(\"repo\"),\n \t\t\t N_(\"reference repository\")),\n-\t\tOPT_STRING(0, \"ref-format\", &ref_storage_format, N_(\"format\"),\n-\t\t\t N_(\"specify the reference format to use\")),\n+\t\tOPT_STRING(0, \"ref-storage\", &ref_storage_format, N_(\"format\"),\n+\t\t\t N_(\"specify the reference storage format to use\")),\n+\t\tOPT_STRING_F(0, \"ref-format\", &ref_storage_format, N_(\"format\"),\n+\t\t\t N_(\"specify the reference storage format to use\"), PARSE_OPT_HIDDEN),\n \t\tOPT_BOOL(0, \"dissociate\", &opt.dissociate,\n \t\t\t N_(\"use --reference only while cloning\")),\n \t\tOPT_INTEGER(0, \"depth\", &opt.depth,\n@@ -3659,8 +3663,10 @@ static int module_add(int argc, const char **argv, const char *prefix,\n \t\tOPT_BOOL(0, \"progress\", &progress, N_(\"force cloning progress\")),\n \t\tOPT_STRING(0, \"reference\", &add_data.reference_path, N_(\"repository\"),\n \t\t\t N_(\"reference repository\")),\n-\t\tOPT_STRING(0, \"ref-format\", &ref_storage_format, N_(\"format\"),\n-\t\t\t N_(\"specify the reference format to use\")),\n+\t\tOPT_STRING(0, \"ref-storage\", &ref_storage_format, N_(\"format\"),\n+\t\t\t N_(\"specify the reference storage format to use\")),\n+\t\tOPT_STRING_F(0, \"ref-format\", &ref_storage_format, N_(\"format\"),\n+\t\t\t N_(\"specify the reference storage format to use\"), PARSE_OPT_HIDDEN),\n \t\tOPT_BOOL(0, \"dissociate\", &dissociate, N_(\"borrow the objects from reference repositories\")),\n \t\tOPT_STRING(0, \"name\", &add_data.sm_name, N_(\"name\"),\n \t\t\t N_(\"sets the submodule's name to the given string \"\ndiff --git a/git-submodule.sh b/git-submodule.sh\nindex 2999b31fad..3d16f28ad6 100755\n--- a/git-submodule.sh\n+++ b/git-submodule.sh\n@@ -95,13 +95,13 @@ cmd_add()\n \t\t--reference=*)\n \t\t\treference=\"$1\"\n \t\t\t;;\n-\t\t--ref-format)\n+\t\t--ref-format|--ref-storage)\n \t\t\tcase \"$2\" in '') usage ;; esac\n-\t\t\tref_format=\"--ref-format=$2\"\n+\t\t\tref_storage=\"--ref-storage=$2\"\n \t\t\tshift\n \t\t\t;;\n-\t\t--ref-format=*)\n-\t\t\tref_format=\"$1\"\n+\t\t--ref-format=*|--ref-storage=*)\n+\t\t\tref_storage=\"$1\"\n \t\t\t;;\n \t\t--dissociate)\n \t\t\tdissociate=$1\n@@ -147,7 +147,7 @@ cmd_add()\n \t\t$progress \\\n \t\t${branch:+\"$branch\"} \\\n \t\t${reference:+\"$reference\"} \\\n-\t\t${ref_format:+\"$ref_format\"} \\\n+\t\t${ref_storage:+\"$ref_storage\"} \\\n \t\t$dissociate \\\n \t\t${name:+\"$name\"} \\\n \t\t${depth:+\"$depth\"} \\\n@@ -302,13 +302,13 @@ cmd_update()\n \t\t-r|--rebase)\n \t\t\trebase=$1\n \t\t\t;;\n-\t\t--ref-format)\n+\t\t--ref-format|--ref-storage)\n \t\t\tcase \"$2\" in '') usage ;; esac\n-\t\t\tref_format=\"--ref-format=$2\"\n+\t\t\tref_storage=\"--ref-storage=$2\"\n \t\t\tshift\n \t\t\t;;\n-\t\t--ref-format=*)\n-\t\t\tref_format=\"$1\"\n+\t\t--ref-format=*|--ref-storage=*)\n+\t\t\tref_storage=\"$1\"\n \t\t\t;;\n \t\t--reference)\n \t\t\tcase \"$2\" in '') usage ;; esac\n@@ -385,7 +385,7 @@ cmd_update()\n \t\t$rebase \\\n \t\t$merge \\\n \t\t$checkout \\\n-\t\t${ref_format:+\"$ref_format\"} \\\n+\t\t${ref_storage:+\"$ref_storage\"} \\\n \t\t${reference:+\"$reference\"} \\\n \t\t$dissociate \\\n \t\t${depth:+\"$depth\"} \\\ndiff --git a/t/t7424-submodule-mixed-ref-formats.sh b/t/t7424-submodule-mixed-ref-formats.sh\nindex 5c26fc18be..c20d981ef2 100755\n--- a/t/t7424-submodule-mixed-ref-formats.sh\n+++ b/t/t7424-submodule-mixed-ref-formats.sh\n@@ -44,7 +44,7 @@ test_expect_success 'add submodules with different ref storage format' '\n \ttest_commit -C submodule submodule-initial &&\n \tgit init upstream &&\n \ttest_ref_format upstream \"$GIT_DEFAULT_REF_FORMAT\" &&\n-\tgit -C upstream submodule add --ref-format=\"$OTHER_FORMAT\" \"file://$(pwd)/submodule\" &&\n+\tgit -C upstream submodule add --ref-storage=\"$OTHER_FORMAT\" \"file://$(pwd)/submodule\" &&\n \ttest_ref_format upstream/submodule \"$OTHER_FORMAT\"\n '\n \n@@ -82,7 +82,7 @@ test_expect_success 'clone submodules with different ref storage format' '\n \n \tgit clone --no-recurse-submodules \"file://$(pwd)/upstream\" downstream &&\n \ttest_ref_format downstream \"$GIT_DEFAULT_REF_FORMAT\" &&\n-\tgit -C downstream submodule update --init --ref-format=$OTHER_FORMAT &&\n+\tgit -C downstream submodule update --init --ref-storage=$OTHER_FORMAT &&\n \ttest_ref_format downstream/submodule \"$OTHER_FORMAT\"\n '\n \n@@ -122,7 +122,7 @@ test_expect_success 'recursive pull with mixed formats' '\n \t# Clone the upstream repository such that the main repo and its\n \t# submodules have different formats.\n \tgit clone --no-recurse-submodules \"file://$(pwd)/upstream\" downstream &&\n-\tgit -C downstream submodule update --init --ref-format=$OTHER_FORMAT &&\n+\tgit -C downstream submodule update --init --ref-storage=$OTHER_FORMAT &&\n \ttest_ref_format downstream \"$GIT_DEFAULT_REF_FORMAT\" &&\n \ttest_ref_format downstream/submodule \"$OTHER_FORMAT\" &&\n \n\n-- \n2.55.0.1007.g17ff1f9808.dirty\n\n"},{"id":"551946","messageId":"20260904-b4-pks-unify-ref-storage-format-v1-5-08144e5004ff@pks.im","threadId":"66270","inReplyTo":"20260904-b4-pks-unify-ref-storage-format-v1-0-08144e5004ff@pks.im","subject":"[PATCH 05/11] builtin/rev-parse: rename \"--show-ref-format\" to \"--show-ref-storage\"","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-09-04T10:36:06Z","receivedAt":"2026-09-04T10:36:27Z","isPatch":true,"body":"With the same reasoning as for git-init(1), rename \"--show-ref-format\"\nto \"--show-ref-storage\" and keep the old name as an alias.\n\nSigned-off-by: Patrick Steinhardt \n---\n Documentation/git-rev-parse.adoc | 2 +-\n builtin/rev-parse.c | 2 +-\n contrib/completion/git-prompt.sh | 2 +-\n t/perf/perf-lib.sh | 4 ++--\n t/t0001-init.sh | 36 +++++++++++++++++-----------------\n t/t0610-reftable-basics.sh | 16 +++++++--------\n t/t1460-refs-migrate.sh | 4 ++--\n t/t1500-rev-parse.sh | 8 ++++----\n t/t5601-clone.sh | 2 +-\n t/t7424-submodule-mixed-ref-formats.sh | 2 +-\n 10 files changed, 39 insertions(+), 39 deletions(-)\n\ndiff --git a/Documentation/git-rev-parse.adoc b/Documentation/git-rev-parse.adoc\nindex 5398691f3f..4c9dcc5652 100644\n--- a/Documentation/git-rev-parse.adoc\n+++ b/Documentation/git-rev-parse.adoc\n@@ -331,7 +331,7 @@ The following options are unaffected by `--path-format`:\n \trequested and no compatibility algorithm is enabled, prints an empty line. If\n \tnot specified, the default is \"storage\".\n \n---show-ref-format::\n+--show-ref-storage::\n \tShow the reference storage format used for the repository.\n \n \ndiff --git a/builtin/rev-parse.c b/builtin/rev-parse.c\nindex 43693454d5..9822037884 100644\n--- a/builtin/rev-parse.c\n+++ b/builtin/rev-parse.c\n@@ -1134,7 +1134,7 @@ int cmd_rev_parse(int argc,\n \t\t\t\t}\n \t\t\t\tcontinue;\n \t\t\t}\n-\t\t\tif (!strcmp(arg, \"--show-ref-format\")) {\n+\t\t\tif (!strcmp(arg, \"--show-ref-format\") || !strcmp(arg, \"--show-ref-storage\")) {\n \t\t\t\tputs(ref_storage_format_to_name(the_repository->ref_storage_format));\n \t\t\t\tcontinue;\n \t\t\t}\ndiff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh\nindex 6186c474ba..e8107e8325 100644\n--- a/contrib/completion/git-prompt.sh\n+++ b/contrib/completion/git-prompt.sh\n@@ -466,7 +466,7 @@ __git_ps1 ()\n \n \tlocal repo_info rev_parse_exit_code\n \trepo_info=\"$(git rev-parse --git-dir --is-inside-git-dir \\\n-\t\t--is-bare-repository --is-inside-work-tree --show-ref-format \\\n+\t\t--is-bare-repository --is-inside-work-tree --show-ref-storage \\\n \t\t--short HEAD 2>/dev/null)\"\n \trev_parse_exit_code=\"$?\"\n \ndiff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh\nindex 50a35545a1..b2826bc696 100644\n--- a/t/perf/perf-lib.sh\n+++ b/t/perf/perf-lib.sh\n@@ -135,7 +135,7 @@ test_perf_create_repo_from () {\n \tsource_git=\"$(\"$MODERN_GIT\" -C \"$source\" rev-parse --git-dir)\"\n \tobjects_dir=\"$(\"$MODERN_GIT\" -C \"$source\" rev-parse --git-path objects)\"\n \tcommon_dir=\"$(\"$MODERN_GIT\" -C \"$source\" rev-parse --git-common-dir)\"\n-\trefformat=\"$(\"$MODERN_GIT\" -C \"$source\" rev-parse --show-ref-format)\"\n+\trefstorage=\"$(\"$MODERN_GIT\" -C \"$source\" rev-parse --show-ref-storage)\"\n \tobjectformat=\"$(\"$MODERN_GIT\" -C \"$source\" rev-parse --show-object-format)\"\n \tmkdir -p \"$repo/.git\"\n \t(\n@@ -153,7 +153,7 @@ test_perf_create_repo_from () {\n \t) &&\n \t(\n \t\tcd \"$repo\" &&\n-\t\t\"$MODERN_GIT\" init -q --ref-storage=\"$refformat\" --object-format=\"$objectformat\" &&\n+\t\t\"$MODERN_GIT\" init -q --ref-storage=\"$refstorage\" --object-format=\"$objectformat\" &&\n \t\ttest_perf_do_repo_symlink_config_ &&\n \t\tmv .git/hooks .git/hooks-disabled 2>/dev/null &&\n \t\tif test -f .git/index.lock\ndiff --git a/t/t0001-init.sh b/t/t0001-init.sh\nindex bb3ec31097..26bd8c6822 100755\n--- a/t/t0001-init.sh\n+++ b/t/t0001-init.sh\n@@ -657,7 +657,7 @@ test_expect_success 'init warns about invalid init.defaultRefFormat' '\n \tgit init repo 2>err &&\n \ttest_cmp expect err &&\n \n-\tgit -C repo rev-parse --show-ref-format >actual &&\n+\tgit -C repo rev-parse --show-ref-storage >actual &&\n \techo $GIT_DEFAULT_REF_FORMAT >expected &&\n \ttest_cmp expected actual\n '\n@@ -669,7 +669,7 @@ test_expect_success 'default ref format' '\n \t\tgit init refformat\n \t) &&\n \tgit version --build-options | sed -ne \"s/^default-ref-format: //p\" >expect &&\n-\tgit -C refformat rev-parse --show-ref-format >actual &&\n+\tgit -C refformat rev-parse --show-ref-storage >actual &&\n \ttest_cmp expect actual\n '\n \n@@ -692,7 +692,7 @@ do\n \t\ttest_cmp expect actual &&\n \n \t\techo $format >expect &&\n-\t\tgit -C refformat rev-parse --show-ref-format >actual &&\n+\t\tgit -C refformat rev-parse --show-ref-storage >actual &&\n \t\ttest_cmp expect actual\n \t'\n \n@@ -700,7 +700,7 @@ do\n \t\ttest_when_finished \"rm -rf refformat\" &&\n \t\tgit init --ref-storage=$format refformat &&\n \t\techo $format >expect &&\n-\t\tgit -C refformat rev-parse --show-ref-format >actual &&\n+\t\tgit -C refformat rev-parse --show-ref-storage >actual &&\n \t\ttest_cmp expect actual\n \t'\n \n@@ -713,7 +713,7 @@ do\n \t\t) &&\n \n \t\techo $format >expect &&\n-\t\tgit -C refformat rev-parse --show-ref-format >actual &&\n+\t\tgit -C refformat rev-parse --show-ref-storage >actual &&\n \t\ttest_cmp expect actual\n \t'\n \n@@ -721,16 +721,16 @@ do\n \t\ttest_when_finished \"rm -rf refformat\" &&\n \t\tGIT_DEFAULT_REF_FORMAT=garbage git init --ref-storage=$format refformat &&\n \t\techo $format >expect &&\n-\t\tgit -C refformat rev-parse --show-ref-format >actual &&\n+\t\tgit -C refformat rev-parse --show-ref-storage >actual &&\n \t\ttest_cmp expect actual\n \t'\n \n \ttest_expect_success \"reinit repository with GIT_DEFAULT_REF_FORMAT=$format does not change format\" '\n \t\ttest_when_finished \"rm -rf refformat\" &&\n \t\tgit init refformat &&\n-\t\tgit -C refformat rev-parse --show-ref-format >expect &&\n+\t\tgit -C refformat rev-parse --show-ref-storage >expect &&\n \t\tGIT_DEFAULT_REF_FORMAT=$format git init refformat &&\n-\t\tgit -C refformat rev-parse --show-ref-format >actual &&\n+\t\tgit -C refformat rev-parse --show-ref-storage >actual &&\n \t\ttest_cmp expect actual\n \t'\n done\n@@ -739,7 +739,7 @@ test_expect_success \"--ref-storage= overrides GIT_DEFAULT_REF_FORMAT\" '\n \ttest_when_finished \"rm -rf refformat\" &&\n \tGIT_DEFAULT_REF_FORMAT=files git init --ref-storage=reftable refformat &&\n \techo reftable >expect &&\n-\tgit -C refformat rev-parse --show-ref-format >actual &&\n+\tgit -C refformat rev-parse --show-ref-storage >actual &&\n \ttest_cmp expect actual\n '\n \n@@ -749,7 +749,7 @@ test_expect_success \"GIT_DEFAULT_REF_FORMAT= overrides init.defaultRefFormat\" '\n \n \tGIT_DEFAULT_REF_FORMAT=reftable git init refformat &&\n \techo reftable >expect &&\n-\tgit -C refformat rev-parse --show-ref-format >actual &&\n+\tgit -C refformat rev-parse --show-ref-storage >actual &&\n \ttest_cmp expect actual\n '\n \n@@ -761,7 +761,7 @@ test_expect_success \"init with feature.experimental=true\" '\n \t\tgit init refformat\n \t) &&\n \techo reftable >expect &&\n-\tgit -C refformat rev-parse --show-ref-format >actual &&\n+\tgit -C refformat rev-parse --show-ref-storage >actual &&\n \ttest_cmp expect actual\n '\n \n@@ -774,7 +774,7 @@ test_expect_success \"init.defaultRefFormat overrides feature.experimental=true\"\n \t\tgit init refformat\n \t) &&\n \techo files >expect &&\n-\tgit -C refformat rev-parse --show-ref-format >actual &&\n+\tgit -C refformat rev-parse --show-ref-storage >actual &&\n \ttest_cmp expect actual\n '\n \n@@ -783,7 +783,7 @@ test_expect_success \"GIT_DEFAULT_REF_FORMAT= overrides feature.experimental=true\n \ttest_config_global feature.experimental true &&\n \tGIT_DEFAULT_REF_FORMAT=files git init refformat &&\n \techo files >expect &&\n-\tgit -C refformat rev-parse --show-ref-format >actual &&\n+\tgit -C refformat rev-parse --show-ref-storage >actual &&\n \ttest_cmp expect actual\n '\n \n@@ -794,7 +794,7 @@ do\n \t\tgit init --ref-storage=$from_format refformat &&\n \t\tgit init --ref-storage=$from_format refformat &&\n \t\techo $from_format >expect &&\n-\t\tgit -C refformat rev-parse --show-ref-format >actual &&\n+\t\tgit -C refformat rev-parse --show-ref-storage >actual &&\n \t\ttest_cmp expect actual\n \t'\n \n@@ -814,7 +814,7 @@ do\n \t\t\ttest_must_fail git init --ref-storage=$to_format refformat 2>err &&\n \t\t\ttest_cmp expect err &&\n \t\t\techo $from_format >expect &&\n-\t\t\tgit -C refformat rev-parse --show-ref-format >actual &&\n+\t\t\tgit -C refformat rev-parse --show-ref-storage >actual &&\n \t\t\ttest_cmp expect actual\n \t\t'\n \tdone\n@@ -933,7 +933,7 @@ test_expect_success 'init with includeIf.onbranch condition' '\n \ttest_when_finished \"rm -rf repo\" &&\n \tgit -c includeIf.onbranch:main.path=nonexistent init repo &&\n \techo $GIT_DEFAULT_REF_FORMAT >expect &&\n-\tgit -C repo rev-parse --show-ref-format >actual &&\n+\tgit -C repo rev-parse --show-ref-storage >actual &&\n \ttest_cmp expect actual\n '\n \n@@ -942,7 +942,7 @@ test_expect_success 'init with includeIf.onbranch condition with existing direct\n \tmkdir repo &&\n \tgit -c includeIf.onbranch:nonexistent.path=/does/not/exist init repo &&\n \techo $GIT_DEFAULT_REF_FORMAT >expect &&\n-\tgit -C repo rev-parse --show-ref-format >actual &&\n+\tgit -C repo rev-parse --show-ref-storage >actual &&\n \ttest_cmp expect actual\n '\n \n@@ -951,7 +951,7 @@ test_expect_success 're-init with includeIf.onbranch condition' '\n \tgit init repo &&\n \tgit -c includeIf.onbranch:nonexistent.path=/does/not/exist init repo &&\n \techo $GIT_DEFAULT_REF_FORMAT >expect &&\n-\tgit -C repo rev-parse --show-ref-format >actual &&\n+\tgit -C repo rev-parse --show-ref-storage >actual &&\n \ttest_cmp expect actual\n '\n \ndiff --git a/t/t0610-reftable-basics.sh b/t/t0610-reftable-basics.sh\nindex d367b4b787..8588904c3f 100755\n--- a/t/t0610-reftable-basics.sh\n+++ b/t/t0610-reftable-basics.sh\n@@ -27,7 +27,7 @@ test_expect_success 'init: creates basic reftable structures' '\n \ttest_path_is_dir repo/.git/reftable &&\n \ttest_path_is_file repo/.git/reftable/tables.list &&\n \techo reftable >expect &&\n-\tgit -C repo rev-parse --show-ref-format >actual &&\n+\tgit -C repo rev-parse --show-ref-storage >actual &&\n \ttest_cmp expect actual\n '\n \n@@ -38,7 +38,7 @@ test_expect_success 'init: sha256 object format via environment variable' '\n \tsha256\n \treftable\n \tEOF\n-\tgit -C repo rev-parse --show-object-format --show-ref-format >actual &&\n+\tgit -C repo rev-parse --show-object-format --show-ref-storage >actual &&\n \ttest_cmp expect actual\n '\n \n@@ -49,7 +49,7 @@ test_expect_success 'init: sha256 object format via option' '\n \tsha256\n \treftable\n \tEOF\n-\tgit -C repo rev-parse --show-object-format --show-ref-format >actual &&\n+\tgit -C repo rev-parse --show-object-format --show-ref-storage >actual &&\n \ttest_cmp expect actual\n '\n \n@@ -156,7 +156,7 @@ test_expect_success 'clone: can clone reftable repository' '\n \n \tgit clone repo cloned &&\n \techo reftable >expect &&\n-\tgit -C cloned rev-parse --show-ref-format >actual &&\n+\tgit -C cloned rev-parse --show-ref-storage >actual &&\n \ttest_cmp expect actual &&\n \ttest_path_is_file cloned/file1\n '\n@@ -171,11 +171,11 @@ test_expect_success 'clone: can clone reffiles into reftable repository' '\n \tgit -C reftable rev-parse HEAD >actual &&\n \ttest_cmp expect actual &&\n \n-\tgit -C reftable rev-parse --show-ref-format >actual &&\n+\tgit -C reftable rev-parse --show-ref-storage >actual &&\n \techo reftable >expect &&\n \ttest_cmp expect actual &&\n \n-\tgit -C reffiles rev-parse --show-ref-format >actual &&\n+\tgit -C reffiles rev-parse --show-ref-storage >actual &&\n \techo files >expect &&\n \ttest_cmp expect actual\n '\n@@ -190,11 +190,11 @@ test_expect_success 'clone: can clone reftable into reffiles repository' '\n \tgit -C reffiles rev-parse HEAD >actual &&\n \ttest_cmp expect actual &&\n \n-\tgit -C reftable rev-parse --show-ref-format >actual &&\n+\tgit -C reftable rev-parse --show-ref-storage >actual &&\n \techo reftable >expect &&\n \ttest_cmp expect actual &&\n \n-\tgit -C reffiles rev-parse --show-ref-format >actual &&\n+\tgit -C reffiles rev-parse --show-ref-storage >actual &&\n \techo files >expect &&\n \ttest_cmp expect actual\n '\ndiff --git a/t/t1460-refs-migrate.sh b/t/t1460-refs-migrate.sh\nindex 4f2ff725ce..2d73537de6 100755\n--- a/t/t1460-refs-migrate.sh\n+++ b/t/t1460-refs-migrate.sh\n@@ -53,7 +53,7 @@ test_migration () {\n \t\ttest_cmp expect_logs actual_logs\n \tfi &&\n \n-\tgit -C \"$repo\" rev-parse --show-ref-format >actual &&\n+\tgit -C \"$repo\" rev-parse --show-ref-storage >actual &&\n \techo \"$format\" >expect &&\n \ttest_cmp expect actual\n }\n@@ -215,7 +215,7 @@ do\n \t\t\ttest_grep \"Finished dry-run migration of refs\" output &&\n \t\t\ttest_path_is_dir repo/.git/ref_migration.* &&\n \t\t\techo $from_format >expect &&\n-\t\t\tgit -C repo rev-parse --show-ref-format >actual &&\n+\t\t\tgit -C repo rev-parse --show-ref-storage >actual &&\n \t\t\ttest_cmp expect actual\n \t\t'\n \ndiff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh\nindex 4174ca40c3..72fe262484 100755\n--- a/t/t1500-rev-parse.sh\n+++ b/t/t1500-rev-parse.sh\n@@ -241,19 +241,19 @@ test_expect_success RUST 'rev-parse --show-object-format in repo with compat mod\n \t)\n '\n \n-test_expect_success 'rev-parse --show-ref-format' '\n+test_expect_success 'rev-parse --show-ref-storage' '\n \ttest_detect_ref_format >expect &&\n-\tgit rev-parse --show-ref-format >actual &&\n+\tgit rev-parse --show-ref-storage >actual &&\n \ttest_cmp expect actual\n '\n \n-test_expect_success 'rev-parse --show-ref-format with invalid storage' '\n+test_expect_success 'rev-parse --show-ref-storage with invalid storage' '\n \ttest_when_finished \"rm -rf repo\" &&\n \tgit init repo &&\n \t(\n \t\tcd repo &&\n \t\tgit config extensions.refstorage broken &&\n-\t\ttest_must_fail git rev-parse --show-ref-format 2>err &&\n+\t\ttest_must_fail git rev-parse --show-ref-storage 2>err &&\n \t\ttest_grep \"error: invalid value for ${SQ}extensions.refstorage${SQ}: ${SQ}broken${SQ}\" err\n \t)\n '\ndiff --git a/t/t5601-clone.sh b/t/t5601-clone.sh\nindex 88f359914f..c0c17cf75a 100755\n--- a/t/t5601-clone.sh\n+++ b/t/t5601-clone.sh\n@@ -168,7 +168,7 @@ test_expect_success 'clone with files ref format' '\n \ttest_when_finished \"rm -rf ref-storage\" &&\n \tgit clone --ref-storage=files --mirror src ref-storage &&\n \techo files >expect &&\n-\tgit -C ref-storage rev-parse --show-ref-format >actual &&\n+\tgit -C ref-storage rev-parse --show-ref-storage >actual &&\n \ttest_cmp expect actual\n '\n \ndiff --git a/t/t7424-submodule-mixed-ref-formats.sh b/t/t7424-submodule-mixed-ref-formats.sh\nindex c20d981ef2..4d03b71243 100755\n--- a/t/t7424-submodule-mixed-ref-formats.sh\n+++ b/t/t7424-submodule-mixed-ref-formats.sh\n@@ -6,7 +6,7 @@ test_description='submodules handle mixed ref storage formats'\n \n test_ref_format () {\n \techo \"$2\" >expect &&\n-\tgit -C \"$1\" rev-parse --show-ref-format >actual &&\n+\tgit -C \"$1\" rev-parse --show-ref-storage >actual &&\n \ttest_cmp expect actual\n }\n \n\n-- \n2.55.0.1007.g17ff1f9808.dirty\n\n"},{"id":"551947","messageId":"20260904-b4-pks-unify-ref-storage-format-v1-6-08144e5004ff@pks.im","threadId":"66270","inReplyTo":"20260904-b4-pks-unify-ref-storage-format-v1-0-08144e5004ff@pks.im","subject":"[PATCH 06/11] help: rename \"default-ref-format\" to \"default-ref-storage\"","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-09-04T10:36:07Z","receivedAt":"2026-09-04T10:36:29Z","isPatch":true,"body":"When printing information about how specifically Git was built and what\ndefaults it has we also print the default ref storage format used when\ninitializing new repositories. This is to prepare for Git 3.0, where the\ndefault storage format will change from the \"files\" backend to the\n\"reftable\" backend.\n\nIn preceding commits we have adapted \"ref-format\" parameters to be\ncalled \"ref-storage\" instead to resolve some conceptual mismatches. The\nbuild information is now the only place where we still refer to it as\n\"default-ref-format\".\n\nRename the field to \"default-ref-storage\" instead.\n\nSigned-off-by: Patrick Steinhardt \n---\n help.c | 2 +-\n t/t0001-init.sh | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/help.c b/help.c\nindex 46241492ce..61ffadcdc4 100644\n--- a/help.c\n+++ b/help.c\n@@ -824,7 +824,7 @@ void get_version_info(struct strbuf *buf, int show_build_options)\n \t\t\t SHA1_UNSAFE_BACKEND);\n #endif\n \t\tstrbuf_addf(buf, \"SHA-256: %s\\n\", SHA256_BACKEND);\n-\t\tstrbuf_addf(buf, \"default-ref-format: %s\\n\",\n+\t\tstrbuf_addf(buf, \"default-ref-storage: %s\\n\",\n \t\t\t ref_storage_format_to_name(REF_STORAGE_FORMAT_DEFAULT));\n \t\tstrbuf_addf(buf, \"default-hash: %s\\n\", hash_algos[GIT_HASH_DEFAULT].name);\n \t}\ndiff --git a/t/t0001-init.sh b/t/t0001-init.sh\nindex 26bd8c6822..24590ce908 100755\n--- a/t/t0001-init.sh\n+++ b/t/t0001-init.sh\n@@ -668,7 +668,7 @@ test_expect_success 'default ref format' '\n \t\tsane_unset GIT_DEFAULT_REF_FORMAT &&\n \t\tgit init refformat\n \t) &&\n-\tgit version --build-options | sed -ne \"s/^default-ref-format: //p\" >expect &&\n+\tgit version --build-options | sed -ne \"s/^default-ref-storage: //p\" >expect &&\n \tgit -C refformat rev-parse --show-ref-storage >actual &&\n \ttest_cmp expect actual\n '\n\n-- \n2.55.0.1007.g17ff1f9808.dirty\n\n"},{"id":"551948","messageId":"20260904-b4-pks-unify-ref-storage-format-v1-7-08144e5004ff@pks.im","threadId":"66270","inReplyTo":"20260904-b4-pks-unify-ref-storage-format-v1-0-08144e5004ff@pks.im","subject":"[PATCH 07/11] refs: expose function to parse reference URIs","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-09-04T10:36:08Z","receivedAt":"2026-09-04T10:36:32Z","isPatch":true,"body":"In the next commit we're about to add more sites that want to parse a\nreference backends URI into a format and payload. Expose a new function\n`ref_storage_format_by_uri()` that enables this.\n\nSigned-off-by: Patrick Steinhardt \n---\n refs.c | 23 +++++++++++++++++++++++\n refs.h | 4 ++++\n setup.c | 48 ++++++++++++------------------------------------\n 3 files changed, 39 insertions(+), 36 deletions(-)\n\ndiff --git a/refs.c b/refs.c\nindex 92d5df5b71..951db56113 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -54,6 +54,29 @@ enum ref_storage_format ref_storage_format_by_name(const char *name)\n \treturn REF_STORAGE_FORMAT_UNKNOWN;\n }\n \n+enum ref_storage_format ref_storage_format_by_uri(const char *uri,\n+\t\t\t\t\t\t char **payload)\n+{\n+\tenum ref_storage_format format;\n+\tconst char *schema_end;\n+\tchar *name;\n+\n+\tschema_end = strstr(uri, \"://\");\n+\tif (!schema_end) {\n+\t\tname = xstrdup(uri);\n+\t\tif (payload)\n+\t\t\t*payload = NULL;\n+\t} else {\n+\t\tname = xstrndup(uri, schema_end - uri);\n+\t\tif (payload)\n+\t\t\t*payload = xstrdup(schema_end + 3);\n+\t}\n+\n+\tformat = ref_storage_format_by_name(name);\n+\tfree(name);\n+\treturn format;\n+}\n+\n const char *ref_storage_format_to_name(enum ref_storage_format ref_storage_format)\n {\n \tconst struct ref_storage_be *be = find_ref_storage_backend(ref_storage_format);\ndiff --git a/refs.h b/refs.h\nindex 9979446d15..ee3b8a62ef 100644\n--- a/refs.h\n+++ b/refs.h\n@@ -17,6 +17,10 @@ struct worktree;\n enum ref_storage_format ref_storage_format_by_name(const char *name);\n const char *ref_storage_format_to_name(enum ref_storage_format ref_storage_format);\n \n+/* Parse a reference storage URI in the format \"[://]\". */\n+enum ref_storage_format ref_storage_format_by_uri(const char *uri,\n+\t\t\t\t\t\t char **payload);\n+\n enum ref_transaction_error {\n \t/* Default error code */\n \tREF_TRANSACTION_ERROR_GENERIC = -1,\ndiff --git a/setup.c b/setup.c\nindex dfe05d9a03..3be7dac452 100644\n--- a/setup.c\n+++ b/setup.c\n@@ -632,21 +632,6 @@ static enum extension_result handle_extension_v0(const char *var,\n \t\treturn EXTENSION_UNKNOWN;\n }\n \n-static void parse_reference_uri(const char *value, char **format,\n-\t\t\t\tchar **payload)\n-{\n-\tconst char *schema_end;\n-\n-\tschema_end = strstr(value, \"://\");\n-\tif (!schema_end) {\n-\t\t*format = xstrdup(value);\n-\t\t*payload = NULL;\n-\t} else {\n-\t\t*format = xstrndup(value, schema_end - value);\n-\t\t*payload = xstrdup_or_null(schema_end + 3);\n-\t}\n-}\n-\n /*\n * Record any new extensions in this function.\n */\n@@ -689,16 +674,13 @@ static enum extension_result handle_extension(const char *var,\n \t\treturn EXTENSION_OK;\n \t} else if (!strcmp(ext, \"refstorage\")) {\n \t\tunsigned int format;\n-\t\tchar *format_str;\n \n \t\tif (!value)\n \t\t\treturn config_error_nonbool(var);\n \n-\t\tparse_reference_uri(value, &format_str,\n-\t\t\t\t &data->ref_storage_payload);\n-\n-\t\tformat = ref_storage_format_by_name(format_str);\n-\t\tfree(format_str);\n+\t\tFREE_AND_NULL(data->ref_storage_payload);\n+\t\tformat = ref_storage_format_by_uri(value,\n+\t\t\t\t\t\t &data->ref_storage_payload);\n \n \t\tif (format == REF_STORAGE_FORMAT_UNKNOWN)\n \t\t\treturn error(_(\"invalid value for '%s': '%s'\"),\n@@ -2069,16 +2051,12 @@ const char *setup_git_directory_gently(struct repository *repo, int *nongit_ok)\n \t\t\t */\n \t\t\tref_backend_uri = getenv(GIT_REFERENCE_BACKEND_ENVIRONMENT);\n \t\t\tif (ref_backend_uri) {\n-\t\t\t\tchar *format;\n-\n-\t\t\t\tfree(discovery.format.ref_storage_payload);\n-\n-\t\t\t\tparse_reference_uri(ref_backend_uri, &format, &discovery.format.ref_storage_payload);\n-\t\t\t\tdiscovery.format.ref_storage_format = ref_storage_format_by_name(format);\n+\t\t\t\tFREE_AND_NULL(discovery.format.ref_storage_payload);\n+\t\t\t\tdiscovery.format.ref_storage_format =\n+\t\t\t\t\tref_storage_format_by_uri(ref_backend_uri,\n+\t\t\t\t\t\t\t\t &discovery.format.ref_storage_payload);\n \t\t\t\tif (discovery.format.ref_storage_format == REF_STORAGE_FORMAT_UNKNOWN)\n-\t\t\t\t\tdie(_(\"unknown ref storage format: '%s'\"), format);\n-\n-\t\t\t\tfree(format);\n+\t\t\t\t\tdie(_(\"unknown ref storage format: '%s'\"), ref_backend_uri);\n \t\t\t}\n \n \t\t\tif (apply_repository_format(repo, &discovery.format,\n@@ -2806,18 +2784,16 @@ static void repository_format_configure(struct repository_format *repo_fmt,\n \n \tref_backend_uri = getenv(GIT_REFERENCE_BACKEND_ENVIRONMENT);\n \tif (ref_backend_uri) {\n-\t\tchar *backend, *payload;\n \t\tenum ref_storage_format format;\n+\t\tchar *payload;\n \n-\t\tparse_reference_uri(ref_backend_uri, &backend, &payload);\n-\t\tformat = ref_storage_format_by_name(backend);\n+\t\tformat = ref_storage_format_by_uri(ref_backend_uri, &payload);\n \t\tif (format == REF_STORAGE_FORMAT_UNKNOWN)\n-\t\t\tdie(_(\"unknown ref storage format: '%s'\"), backend);\n+\t\t\tdie(_(\"unknown ref storage format: '%s'\"), ref_backend_uri);\n \n \t\trepo_fmt->ref_storage_format = format;\n+\t\tfree(repo_fmt->ref_storage_payload);\n \t\trepo_fmt->ref_storage_payload = payload;\n-\n-\t\tfree(backend);\n \t}\n }\n \n\n-- \n2.55.0.1007.g17ff1f9808.dirty\n\n"},{"id":"551949","messageId":"20260904-b4-pks-unify-ref-storage-format-v1-8-08144e5004ff@pks.im","threadId":"66270","inReplyTo":"20260904-b4-pks-unify-ref-storage-format-v1-0-08144e5004ff@pks.im","subject":"[PATCH 08/11] setup: refactor how we configure the ref storage format","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-09-04T10:36:09Z","receivedAt":"2026-09-04T10:36:34Z","isPatch":true,"body":"When (re)initializing a repository we need to figure out the ref storage\nformat that the repository ought to use. This logic is surprisingly\ncomplex, as we have grown a lot of different mechanisms over time to\nconfigure the format. Unfortunately, as a result of this organic growth,\nthe logic that configures the storage format has grown very complex.\n\nThe biggest culprit here is that we're mixing the logic that determines\nthe desired storage format with the logic that validates whether the end\nresult is sane. This leads to some repetitive code, and makes it very\neasy to forget validation for some of the branches.\n\nIn fact, the way we handle GIT_REFERENCE_BACKEND shows exactly one such\nedge case where we don't properly validate. When initializing a\nrepository with one storage format and then reinitializing it with the\nenvironment variable set to a different format then we'd corrupt the\nrepository because we silently change the format:\n\n $ git init repo\n $ git -C repo commit --allow-empty -m message\n $ GIT_REFERENCE_BACKEND=reftable git -C repo init\n fatal: could not open '.../refs/heads' for writing: Is a directory\n $ git -C repo log\n fatal: your current branch appears to be broken\n\nRefactor the code so that we clearly distinguish between these two\ndifferent concerns. This lets us clearly spell out the precedence order\nand makes the whole logic significantly easier to extend going forward.\n\nNote that the new logic intentionally changes the precedence order so\nthat \"GIT_REFERENCE_BACKEND\" is now overridden by the \"--ref-storage=\"\ncommand line option. This matches our usual precedence order, where\nexplicit command line arguments override environment variables.\n\nSigned-off-by: Patrick Steinhardt \n---\n setup.c | 103 +++++++++++++++++++++++++++++++++++---------------------\n t/t0001-init.sh | 12 ++++++-\n 2 files changed, 75 insertions(+), 40 deletions(-)\n\ndiff --git a/setup.c b/setup.c\nindex 3be7dac452..d6e28dd675 100644\n--- a/setup.c\n+++ b/setup.c\n@@ -2674,7 +2674,7 @@ static void separate_git_dir(struct repository *repo,\n \n struct default_format_config {\n \tint hash;\n-\tenum ref_storage_format ref_format;\n+\tenum ref_storage_format ref_storage_format;\n };\n \n static int read_default_format_config(const char *key, const char *value,\n@@ -2699,8 +2699,8 @@ static int read_default_format_config(const char *key, const char *value,\n \t\tret = git_config_string(&str, key, value);\n \t\tif (ret)\n \t\t\tgoto out;\n-\t\tcfg->ref_format = ref_storage_format_by_name(str);\n-\t\tif (cfg->ref_format == REF_STORAGE_FORMAT_UNKNOWN)\n+\t\tcfg->ref_storage_format = ref_storage_format_by_name(str);\n+\t\tif (cfg->ref_storage_format == REF_STORAGE_FORMAT_UNKNOWN)\n \t\t\twarning(_(\"unknown ref storage format '%s'\"), str);\n \t\tgoto out;\n \t}\n@@ -2710,9 +2710,9 @@ static int read_default_format_config(const char *key, const char *value,\n \t * \"init.defaultRefFormat\" takes precedence over this setting.\n \t */\n \tif (!strcmp(key, \"feature.experimental\") &&\n-\t cfg->ref_format == REF_STORAGE_FORMAT_UNKNOWN &&\n+\t cfg->ref_storage_format == REF_STORAGE_FORMAT_UNKNOWN &&\n \t git_config_bool(key, value)) {\n-\t\tcfg->ref_format = REF_STORAGE_FORMAT_REFTABLE;\n+\t\tcfg->ref_storage_format = REF_STORAGE_FORMAT_REFTABLE;\n \t\tret = 0;\n \t\tgoto out;\n \t}\n@@ -2724,18 +2724,18 @@ static int read_default_format_config(const char *key, const char *value,\n }\n \n static void repository_format_configure(struct repository_format *repo_fmt,\n-\t\t\t\t\tint hash, enum ref_storage_format ref_format)\n+\t\t\t\t\tint hash, enum ref_storage_format ref_storage_format)\n {\n \tstruct default_format_config cfg = {\n \t\t.hash = GIT_HASH_UNKNOWN,\n-\t\t.ref_format = REF_STORAGE_FORMAT_UNKNOWN,\n+\t\t.ref_storage_format = REF_STORAGE_FORMAT_UNKNOWN,\n \t};\n \tstruct config_options opts = {\n \t\t.respect_includes = 1,\n \t\t.ignore_repo = 1,\n \t\t.ignore_worktree = 1,\n \t};\n-\tconst char *ref_backend_uri;\n+\tchar *ref_storage_payload = NULL;\n \tconst char *env;\n \n \tconfig_with_options(read_default_format_config, &cfg, NULL, NULL, &opts);\n@@ -2761,40 +2761,65 @@ static void repository_format_configure(struct repository_format *repo_fmt,\n \t\trepo_fmt->hash_algo = cfg.hash;\n \t}\n \n-\tenv = getenv(\"GIT_DEFAULT_REF_FORMAT\");\n-\tif (repo_fmt->version >= 0 &&\n-\t ref_format != REF_STORAGE_FORMAT_UNKNOWN &&\n-\t ref_format != repo_fmt->ref_storage_format) {\n-\t\tdie(_(\"attempt to reinitialize repository with different reference storage format\"));\n-\t} else if (ref_format != REF_STORAGE_FORMAT_UNKNOWN) {\n-\t\trepo_fmt->ref_storage_format = ref_format;\n-\t} else if (env) {\n-\t\tref_format = ref_storage_format_by_name(env);\n-\t\tif (ref_format == REF_STORAGE_FORMAT_UNKNOWN)\n-\t\t\tdie(_(\"unknown ref storage format '%s'\"), env);\n-\t\tif (repo_fmt->version < 0 ||\n-\t\t repo_fmt->ref_storage_format == REF_STORAGE_FORMAT_UNKNOWN)\n-\t\t\trepo_fmt->ref_storage_format = ref_format;\n-\t} else if (cfg.ref_format != REF_STORAGE_FORMAT_UNKNOWN) {\n-\t\trepo_fmt->ref_storage_format = cfg.ref_format;\n+\t/*\n+\t * We have the following order of preference when configuring the ref\n+\t * storage format:\n+\t *\n+\t * 1. Explicit override via the command line, like in `git init\n+\t * --ref-storage=`.\n+\t *\n+\t * 2. Explicit override via the environment with\n+\t * GIT_REFERENCE_BACKEND.\n+\t *\n+\t * 3. Existing repository format. All the subsequent sources only\n+\t * kick in when there is no repository yet.\n+\t *\n+\t * 4. The default ref storage format for new repositories as\n+\t * configured via \"GIT_DEFAULT_REF_FORMAT\".\n+\t *\n+\t * 5. The default ref storage format for new repositories as\n+\t * configured via \"init.defaultRefFormat\"\n+\t *\n+\t * 6. Otherwise, we fall back to the default ref storage format\n+\t * compiled into Git.\n+\t */\n+\tif (ref_storage_format != REF_STORAGE_FORMAT_UNKNOWN) {\n+\t\t/* nothing to do */\n+\t} else if ((env = getenv(GIT_REFERENCE_BACKEND_ENVIRONMENT))) {\n+\t\tref_storage_format = ref_storage_format_by_uri(env, &ref_storage_payload);\n+\t\tif (ref_storage_format == REF_STORAGE_FORMAT_UNKNOWN)\n+\t\t\tdie(_(\"unknown reference storage format specified via %s: '%s'\"),\n+\t\t\t GIT_REFERENCE_BACKEND_ENVIRONMENT, env);\n+\t} else if (repo_fmt->version >= 0) {\n+\t\tref_storage_format = repo_fmt->ref_storage_format;\n+\t\tref_storage_payload = xstrdup_or_null(repo_fmt->ref_storage_payload);\n+\t} else if ((env = getenv(\"GIT_DEFAULT_REF_FORMAT\"))) {\n+\t\tref_storage_format = ref_storage_format_by_name(env);\n+\t\tif (ref_storage_format == REF_STORAGE_FORMAT_UNKNOWN)\n+\t\t\tdie(_(\"unknown reference storage format specified via %s: '%s'\"),\n+\t\t\t \"GIT_DEFAULT_REF_FORMAT\", env);\n+\t} else if (cfg.ref_storage_format != REF_STORAGE_FORMAT_UNKNOWN) {\n+\t\tref_storage_format = cfg.ref_storage_format;\n \t} else {\n-\t\trepo_fmt->ref_storage_format = REF_STORAGE_FORMAT_DEFAULT;\n+\t\tref_storage_format = REF_STORAGE_FORMAT_DEFAULT;\n \t}\n \n-\n-\tref_backend_uri = getenv(GIT_REFERENCE_BACKEND_ENVIRONMENT);\n-\tif (ref_backend_uri) {\n-\t\tenum ref_storage_format format;\n-\t\tchar *payload;\n-\n-\t\tformat = ref_storage_format_by_uri(ref_backend_uri, &payload);\n-\t\tif (format == REF_STORAGE_FORMAT_UNKNOWN)\n-\t\t\tdie(_(\"unknown ref storage format: '%s'\"), ref_backend_uri);\n-\n-\t\trepo_fmt->ref_storage_format = format;\n-\t\tfree(repo_fmt->ref_storage_payload);\n-\t\trepo_fmt->ref_storage_payload = payload;\n-\t}\n+\t/*\n+\t * If we have a preexisting repository we need to verify that its\n+\t * current ref storage format does not change.\n+\t */\n+\tif (repo_fmt->version >= 0) {\n+\t\tif (ref_storage_format != repo_fmt->ref_storage_format)\n+\t\t\tdie(_(\"attempt to reinitialize repository with different reference storage format\"));\n+\t\tif ((ref_storage_payload || repo_fmt->ref_storage_payload) &&\n+\t\t strcmp(ref_storage_payload ? ref_storage_payload : \"\",\n+\t\t\t repo_fmt->ref_storage_payload ? repo_fmt->ref_storage_payload : \"\"))\n+\t\t\tdie(_(\"attempt to reinitialize repository with different reference storage payload\"));\n+\t}\n+\n+\tfree(repo_fmt->ref_storage_payload);\n+\trepo_fmt->ref_storage_format = ref_storage_format;\n+\trepo_fmt->ref_storage_payload = ref_storage_payload;\n }\n \n int init_db(struct repository *repo,\ndiff --git a/t/t0001-init.sh b/t/t0001-init.sh\nindex 24590ce908..d7e592d8a5 100755\n--- a/t/t0001-init.sh\n+++ b/t/t0001-init.sh\n@@ -643,12 +643,22 @@ test_expect_success DEFAULT_REPO_FORMAT 'extensions.refStorage with unknown back\n test_expect_success 'init with GIT_DEFAULT_REF_FORMAT=garbage' '\n \ttest_when_finished \"rm -rf refformat\" &&\n \tcat >expect <<-EOF &&\n-\tfatal: unknown ref storage format ${SQ}garbage${SQ}\n+\tfatal: unknown reference storage format specified via GIT_DEFAULT_REF_FORMAT: ${SQ}garbage${SQ}\n \tEOF\n \ttest_must_fail env GIT_DEFAULT_REF_FORMAT=garbage git init refformat 2>err &&\n \ttest_cmp expect err\n '\n \n+test_expect_success 'GIT_REFERENCE_BACKEND refuses to reinitialize with different storage format' '\n+\ttest_when_finished \"rm -rf refbackend\" &&\n+\tgit init --ref-storage=files refbackend &&\n+\tcat >expect <<-EOF &&\n+\tfatal: attempt to reinitialize repository with different reference storage format\n+\tEOF\n+\ttest_must_fail env GIT_REFERENCE_BACKEND=reftable git init refbackend 2>err &&\n+\ttest_cmp expect err\n+'\n+\n test_expect_success 'init warns about invalid init.defaultRefFormat' '\n \ttest_when_finished \"rm -rf repo\" &&\n \ttest_config_global init.defaultRefFormat garbage &&\n\n-- \n2.55.0.1007.g17ff1f9808.dirty\n\n"},{"id":"551950","messageId":"20260904-b4-pks-unify-ref-storage-format-v1-9-08144e5004ff@pks.im","threadId":"66270","inReplyTo":"20260904-b4-pks-unify-ref-storage-format-v1-0-08144e5004ff@pks.im","subject":"[PATCH 09/11] setup: rename ref storage format environment variables","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-09-04T10:36:10Z","receivedAt":"2026-09-04T10:36:37Z","isPatch":true,"body":"With the same reasoning as for git-init(1), rename the environment\nvariables GIT_REFERENCE_BACKEND and GIT_DEFAULT_REF_FORMAT to\nGIT_REF_STORAGE and GIT_DEFAULT_REF_STORAGE, respectively. The old names\nare kept as an alias to retain compatibility.\n\nSigned-off-by: Patrick Steinhardt \n---\n Documentation/config/init.adoc | 2 +-\n Documentation/git.adoc | 6 ++--\n environment.h | 1 +\n setup.c | 21 ++++++++------\n t/t0001-init.sh | 50 +++++++++++++++++-----------------\n t/t1419-exclude-refs.sh | 16 +++++------\n t/t1423-ref-backend.sh | 18 ++++++------\n t/t7424-submodule-mixed-ref-formats.sh | 14 +++++-----\n t/test-lib.sh | 8 +++---\n 9 files changed, 71 insertions(+), 65 deletions(-)\n\ndiff --git a/Documentation/config/init.adoc b/Documentation/config/init.adoc\nindex 9c78440192..3098e033ac 100644\n--- a/Documentation/config/init.adoc\n+++ b/Documentation/config/init.adoc\n@@ -16,7 +16,7 @@ endif::[]\n `init.defaultRefFormat`::\n \tAllows overriding the default ref storage format for new repositories.\n \tSee `--ref-storage=` in linkgit:git-init[1]. Both the command line\n-\toption and the `GIT_DEFAULT_REF_FORMAT` environment variable take\n+\toption and the `GIT_DEFAULT_REF_STORAGE` environment variable take\n \tprecedence over this config.\n \n init.defaultSubmodulePathConfig::\ndiff --git a/Documentation/git.adoc b/Documentation/git.adoc\nindex e3260fde68..e34c74d995 100644\n--- a/Documentation/git.adoc\n+++ b/Documentation/git.adoc\n@@ -590,13 +590,13 @@ double-quotes and respecting backslash escapes. E.g., the value\n \tis always used. The default is \"sha1\".\n \tSee `--object-format` in linkgit:git-init[1].\n \n-`GIT_DEFAULT_REF_FORMAT`::\n+`GIT_DEFAULT_REF_STORAGE`::\n \tIf this variable is set, the default reference backend format for new\n \trepositories will be set to this value. The default is \"files\".\n \tSee `--ref-storage` in linkgit:git-init[1].\n \n-`GIT_REFERENCE_BACKEND`::\n- Specify which reference backend to be used along with its URI.\n+`GIT_REF_STORAGE`::\n+ Specify which ref storage to be used along with its URI.\n See `extensions.refStorage` option in linkgit:git-config[1] for more\n details. Overrides the config variable when used.\n \ndiff --git a/environment.h b/environment.h\nindex e7ec5b0437..e6b933f8db 100644\n--- a/environment.h\n+++ b/environment.h\n@@ -44,6 +44,7 @@\n #define GIT_TEXT_DOMAIN_DIR_ENVIRONMENT \"GIT_TEXTDOMAINDIR\"\n #define GIT_ATTR_SOURCE_ENVIRONMENT \"GIT_ATTR_SOURCE\"\n #define GIT_REFERENCE_BACKEND_ENVIRONMENT \"GIT_REFERENCE_BACKEND\"\n+#define GIT_REF_STORAGE_ENVIRONMENT \"GIT_REF_STORAGE\"\n \n /*\n * Environment variable used to propagate the --no-advice global option to the\ndiff --git a/setup.c b/setup.c\nindex d6e28dd675..5de2aa0d2f 100644\n--- a/setup.c\n+++ b/setup.c\n@@ -2049,7 +2049,9 @@ const char *setup_git_directory_gently(struct repository *repo, int *nongit_ok)\n \t\t\t * The env variable should override the repository config\n \t\t\t * for 'extensions.refStorage'.\n \t\t\t */\n-\t\t\tref_backend_uri = getenv(GIT_REFERENCE_BACKEND_ENVIRONMENT);\n+\t\t\tref_backend_uri = getenv(GIT_REF_STORAGE_ENVIRONMENT);\n+\t\t\tif (!ref_backend_uri)\n+\t\t\t\tref_backend_uri = getenv(GIT_REFERENCE_BACKEND_ENVIRONMENT);\n \t\t\tif (ref_backend_uri) {\n \t\t\t\tFREE_AND_NULL(discovery.format.ref_storage_payload);\n \t\t\t\tdiscovery.format.ref_storage_format =\n@@ -2768,14 +2770,15 @@ static void repository_format_configure(struct repository_format *repo_fmt,\n \t * 1. Explicit override via the command line, like in `git init\n \t * --ref-storage=`.\n \t *\n-\t * 2. Explicit override via the environment with\n-\t * GIT_REFERENCE_BACKEND.\n+\t * 2. Explicit override via the environment with \"GIT_REF_STORAGE\" or\n+\t * its deprecated equivalent \"GIT_REFERENCE_BACKEND\".\n \t *\n \t * 3. Existing repository format. All the subsequent sources only\n \t * kick in when there is no repository yet.\n \t *\n \t * 4. The default ref storage format for new repositories as\n-\t * configured via \"GIT_DEFAULT_REF_FORMAT\".\n+\t * configured via \"GIT_DEFAULT_REF_STORAGE\" or its deprecated\n+\t * equivalent \"GIT_DEFAULT_REF_FORMAT\".\n \t *\n \t * 5. The default ref storage format for new repositories as\n \t * configured via \"init.defaultRefFormat\"\n@@ -2785,19 +2788,21 @@ static void repository_format_configure(struct repository_format *repo_fmt,\n \t */\n \tif (ref_storage_format != REF_STORAGE_FORMAT_UNKNOWN) {\n \t\t/* nothing to do */\n-\t} else if ((env = getenv(GIT_REFERENCE_BACKEND_ENVIRONMENT))) {\n+\t} else if (((env = getenv(GIT_REF_STORAGE_ENVIRONMENT)) ||\n+\t\t (env = getenv(GIT_REFERENCE_BACKEND_ENVIRONMENT)))) {\n \t\tref_storage_format = ref_storage_format_by_uri(env, &ref_storage_payload);\n \t\tif (ref_storage_format == REF_STORAGE_FORMAT_UNKNOWN)\n \t\t\tdie(_(\"unknown reference storage format specified via %s: '%s'\"),\n-\t\t\t GIT_REFERENCE_BACKEND_ENVIRONMENT, env);\n+\t\t\t GIT_REF_STORAGE_ENVIRONMENT, env);\n \t} else if (repo_fmt->version >= 0) {\n \t\tref_storage_format = repo_fmt->ref_storage_format;\n \t\tref_storage_payload = xstrdup_or_null(repo_fmt->ref_storage_payload);\n-\t} else if ((env = getenv(\"GIT_DEFAULT_REF_FORMAT\"))) {\n+\t} else if (((env = getenv(\"GIT_DEFAULT_REF_STORAGE\")) ||\n+\t\t (env = getenv(\"GIT_DEFAULT_REF_FORMAT\")))) {\n \t\tref_storage_format = ref_storage_format_by_name(env);\n \t\tif (ref_storage_format == REF_STORAGE_FORMAT_UNKNOWN)\n \t\t\tdie(_(\"unknown reference storage format specified via %s: '%s'\"),\n-\t\t\t \"GIT_DEFAULT_REF_FORMAT\", env);\n+\t\t\t \"GIT_DEFAULT_REF_STORAGE\", env);\n \t} else if (cfg.ref_storage_format != REF_STORAGE_FORMAT_UNKNOWN) {\n \t\tref_storage_format = cfg.ref_storage_format;\n \t} else {\ndiff --git a/t/t0001-init.sh b/t/t0001-init.sh\nindex d7e592d8a5..e4b9fae8bd 100755\n--- a/t/t0001-init.sh\n+++ b/t/t0001-init.sh\n@@ -640,22 +640,22 @@ test_expect_success DEFAULT_REPO_FORMAT 'extensions.refStorage with unknown back\n \ttest_grep \"invalid value for ${SQ}extensions.refstorage${SQ}: ${SQ}garbage${SQ}\" err\n '\n \n-test_expect_success 'init with GIT_DEFAULT_REF_FORMAT=garbage' '\n+test_expect_success 'init with GIT_DEFAULT_REF_STORAGE=garbage' '\n \ttest_when_finished \"rm -rf refformat\" &&\n \tcat >expect <<-EOF &&\n-\tfatal: unknown reference storage format specified via GIT_DEFAULT_REF_FORMAT: ${SQ}garbage${SQ}\n+\tfatal: unknown reference storage format specified via GIT_DEFAULT_REF_STORAGE: ${SQ}garbage${SQ}\n \tEOF\n-\ttest_must_fail env GIT_DEFAULT_REF_FORMAT=garbage git init refformat 2>err &&\n+\ttest_must_fail env GIT_DEFAULT_REF_STORAGE=garbage git init refformat 2>err &&\n \ttest_cmp expect err\n '\n \n-test_expect_success 'GIT_REFERENCE_BACKEND refuses to reinitialize with different storage format' '\n+test_expect_success 'GIT_REF_STORAGE refuses to reinitialize with different storage format' '\n \ttest_when_finished \"rm -rf refbackend\" &&\n \tgit init --ref-storage=files refbackend &&\n \tcat >expect <<-EOF &&\n \tfatal: attempt to reinitialize repository with different reference storage format\n \tEOF\n-\ttest_must_fail env GIT_REFERENCE_BACKEND=reftable git init refbackend 2>err &&\n+\ttest_must_fail env GIT_REF_STORAGE=reftable git init refbackend 2>err &&\n \ttest_cmp expect err\n '\n \n@@ -668,14 +668,14 @@ test_expect_success 'init warns about invalid init.defaultRefFormat' '\n \ttest_cmp expect err &&\n \n \tgit -C repo rev-parse --show-ref-storage >actual &&\n-\techo $GIT_DEFAULT_REF_FORMAT >expected &&\n+\techo $GIT_DEFAULT_REF_STORAGE >expected &&\n \ttest_cmp expected actual\n '\n \n test_expect_success 'default ref format' '\n \ttest_when_finished \"rm -rf refformat\" &&\n \t(\n-\t\tsane_unset GIT_DEFAULT_REF_FORMAT &&\n+\t\tsane_unset GIT_DEFAULT_REF_STORAGE &&\n \t\tgit init refformat\n \t) &&\n \tgit version --build-options | sed -ne \"s/^default-ref-storage: //p\" >expect &&\n@@ -686,9 +686,9 @@ test_expect_success 'default ref format' '\n backends=\"files reftable\"\n for format in $backends\n do\n-\ttest_expect_success DEFAULT_REPO_FORMAT \"init with GIT_DEFAULT_REF_FORMAT=$format\" '\n+\ttest_expect_success DEFAULT_REPO_FORMAT \"init with GIT_DEFAULT_REF_STORAGE=$format\" '\n \t\ttest_when_finished \"rm -rf refformat\" &&\n-\t\tGIT_DEFAULT_REF_FORMAT=$format git init refformat &&\n+\t\tGIT_DEFAULT_REF_STORAGE=$format git init refformat &&\n \n \t\tif test $format = files\n \t\tthen\n@@ -718,7 +718,7 @@ do\n \t\ttest_when_finished \"rm -rf refformat\" &&\n \t\ttest_config_global init.defaultRefFormat $format &&\n \t\t(\n-\t\t\tsane_unset GIT_DEFAULT_REF_FORMAT &&\n+\t\t\tsane_unset GIT_DEFAULT_REF_STORAGE &&\n \t\t\tgit init refformat\n \t\t) &&\n \n@@ -727,37 +727,37 @@ do\n \t\ttest_cmp expect actual\n \t'\n \n-\ttest_expect_success \"--ref-storage=$format overrides GIT_DEFAULT_REF_FORMAT\" '\n+\ttest_expect_success \"--ref-storage=$format overrides GIT_DEFAULT_REF_STORAGE\" '\n \t\ttest_when_finished \"rm -rf refformat\" &&\n-\t\tGIT_DEFAULT_REF_FORMAT=garbage git init --ref-storage=$format refformat &&\n+\t\tGIT_DEFAULT_REF_STORAGE=garbage git init --ref-storage=$format refformat &&\n \t\techo $format >expect &&\n \t\tgit -C refformat rev-parse --show-ref-storage >actual &&\n \t\ttest_cmp expect actual\n \t'\n \n-\ttest_expect_success \"reinit repository with GIT_DEFAULT_REF_FORMAT=$format does not change format\" '\n+\ttest_expect_success \"reinit repository with GIT_DEFAULT_REF_STORAGE=$format does not change format\" '\n \t\ttest_when_finished \"rm -rf refformat\" &&\n \t\tgit init refformat &&\n \t\tgit -C refformat rev-parse --show-ref-storage >expect &&\n-\t\tGIT_DEFAULT_REF_FORMAT=$format git init refformat &&\n+\t\tGIT_DEFAULT_REF_STORAGE=$format git init refformat &&\n \t\tgit -C refformat rev-parse --show-ref-storage >actual &&\n \t\ttest_cmp expect actual\n \t'\n done\n \n-test_expect_success \"--ref-storage= overrides GIT_DEFAULT_REF_FORMAT\" '\n+test_expect_success \"--ref-storage= overrides GIT_DEFAULT_REF_STORAGE\" '\n \ttest_when_finished \"rm -rf refformat\" &&\n-\tGIT_DEFAULT_REF_FORMAT=files git init --ref-storage=reftable refformat &&\n+\tGIT_DEFAULT_REF_STORAGE=files git init --ref-storage=reftable refformat &&\n \techo reftable >expect &&\n \tgit -C refformat rev-parse --show-ref-storage >actual &&\n \ttest_cmp expect actual\n '\n \n-test_expect_success \"GIT_DEFAULT_REF_FORMAT= overrides init.defaultRefFormat\" '\n+test_expect_success \"GIT_DEFAULT_REF_STORAGE= overrides init.defaultRefFormat\" '\n \ttest_when_finished \"rm -rf refformat\" &&\n \ttest_config_global init.defaultRefFormat files &&\n \n-\tGIT_DEFAULT_REF_FORMAT=reftable git init refformat &&\n+\tGIT_DEFAULT_REF_STORAGE=reftable git init refformat &&\n \techo reftable >expect &&\n \tgit -C refformat rev-parse --show-ref-storage >actual &&\n \ttest_cmp expect actual\n@@ -767,7 +767,7 @@ test_expect_success \"init with feature.experimental=true\" '\n \ttest_when_finished \"rm -rf refformat\" &&\n \ttest_config_global feature.experimental true &&\n \t(\n-\t\tsane_unset GIT_DEFAULT_REF_FORMAT &&\n+\t\tsane_unset GIT_DEFAULT_REF_STORAGE &&\n \t\tgit init refformat\n \t) &&\n \techo reftable >expect &&\n@@ -780,7 +780,7 @@ test_expect_success \"init.defaultRefFormat overrides feature.experimental=true\"\n \ttest_config_global feature.experimental true &&\n \ttest_config_global init.defaultRefFormat files &&\n \t(\n-\t\tsane_unset GIT_DEFAULT_REF_FORMAT &&\n+\t\tsane_unset GIT_DEFAULT_REF_STORAGE &&\n \t\tgit init refformat\n \t) &&\n \techo files >expect &&\n@@ -788,10 +788,10 @@ test_expect_success \"init.defaultRefFormat overrides feature.experimental=true\"\n \ttest_cmp expect actual\n '\n \n-test_expect_success \"GIT_DEFAULT_REF_FORMAT= overrides feature.experimental=true\" '\n+test_expect_success \"GIT_DEFAULT_REF_STORAGE= overrides feature.experimental=true\" '\n \ttest_when_finished \"rm -rf refformat\" &&\n \ttest_config_global feature.experimental true &&\n-\tGIT_DEFAULT_REF_FORMAT=files git init refformat &&\n+\tGIT_DEFAULT_REF_STORAGE=files git init refformat &&\n \techo files >expect &&\n \tgit -C refformat rev-parse --show-ref-storage >actual &&\n \ttest_cmp expect actual\n@@ -942,7 +942,7 @@ test_expect_success 'branch -m with the initial branch' '\n test_expect_success 'init with includeIf.onbranch condition' '\n \ttest_when_finished \"rm -rf repo\" &&\n \tgit -c includeIf.onbranch:main.path=nonexistent init repo &&\n-\techo $GIT_DEFAULT_REF_FORMAT >expect &&\n+\techo $GIT_DEFAULT_REF_STORAGE >expect &&\n \tgit -C repo rev-parse --show-ref-storage >actual &&\n \ttest_cmp expect actual\n '\n@@ -951,7 +951,7 @@ test_expect_success 'init with includeIf.onbranch condition with existing direct\n \ttest_when_finished \"rm -rf repo\" &&\n \tmkdir repo &&\n \tgit -c includeIf.onbranch:nonexistent.path=/does/not/exist init repo &&\n-\techo $GIT_DEFAULT_REF_FORMAT >expect &&\n+\techo $GIT_DEFAULT_REF_STORAGE >expect &&\n \tgit -C repo rev-parse --show-ref-storage >actual &&\n \ttest_cmp expect actual\n '\n@@ -960,7 +960,7 @@ test_expect_success 're-init with includeIf.onbranch condition' '\n \ttest_when_finished \"rm -rf repo\" &&\n \tgit init repo &&\n \tgit -c includeIf.onbranch:nonexistent.path=/does/not/exist init repo &&\n-\techo $GIT_DEFAULT_REF_FORMAT >expect &&\n+\techo $GIT_DEFAULT_REF_STORAGE >expect &&\n \tgit -C repo rev-parse --show-ref-storage >actual &&\n \ttest_cmp expect actual\n '\ndiff --git a/t/t1419-exclude-refs.sh b/t/t1419-exclude-refs.sh\nindex 04797aee59..8f54bb9e27 100755\n--- a/t/t1419-exclude-refs.sh\n+++ b/t/t1419-exclude-refs.sh\n@@ -21,13 +21,13 @@ assert_jumps () {\n \tlocal nr=\"$1\"\n \tlocal trace=\"$2\"\n \n-\tcase \"$GIT_DEFAULT_REF_FORMAT\" in\n+\tcase \"$GIT_DEFAULT_REF_STORAGE\" in\n \tfiles)\n \t\tgrep -q \"name:jumps_made value:$nr$\" $trace;;\n \treftable)\n \t\tgrep -q \"name:reseeks_made value:$nr$\" $trace;;\n \t*)\n-\t\tBUG \"unhandled ref format $GIT_DEFAULT_REF_FORMAT\";;\n+\t\tBUG \"unhandled ref format $GIT_DEFAULT_REF_STORAGE\";;\n \tesac\n }\n \n@@ -93,13 +93,13 @@ test_expect_success 'adjacent, non-overlapping excluded regions' '\n \tfor_each_ref refs/heads/foo refs/heads/quux >expect &&\n \n \ttest_cmp expect actual &&\n-\tcase \"$GIT_DEFAULT_REF_FORMAT\" in\n+\tcase \"$GIT_DEFAULT_REF_STORAGE\" in\n \tfiles)\n \t\tassert_jumps 1 perf;;\n \treftable)\n \t\tassert_jumps 2 perf;;\n \t*)\n-\t\tBUG \"unhandled ref format $GIT_DEFAULT_REF_FORMAT\";;\n+\t\tBUG \"unhandled ref format $GIT_DEFAULT_REF_STORAGE\";;\n \tesac\n '\n \n@@ -125,13 +125,13 @@ test_expect_success 'several overlapping excluded regions' '\n \tfor_each_ref refs/heads/quux >expect &&\n \n \ttest_cmp expect actual &&\n-\tcase \"$GIT_DEFAULT_REF_FORMAT\" in\n+\tcase \"$GIT_DEFAULT_REF_STORAGE\" in\n \tfiles)\n \t\tassert_jumps 1 perf;;\n \treftable)\n \t\tassert_jumps 3 perf;;\n \t*)\n-\t\tBUG \"unhandled ref format $GIT_DEFAULT_REF_FORMAT\";;\n+\t\tBUG \"unhandled ref format $GIT_DEFAULT_REF_STORAGE\";;\n \tesac\n '\n \n@@ -141,13 +141,13 @@ test_expect_success 'unordered excludes' '\n \tfor_each_ref refs/heads/bar refs/heads/quux >expect &&\n \n \ttest_cmp expect actual &&\n-\tcase \"$GIT_DEFAULT_REF_FORMAT\" in\n+\tcase \"$GIT_DEFAULT_REF_STORAGE\" in\n \tfiles)\n \t\tassert_jumps 1 perf;;\n \treftable)\n \t\tassert_jumps 2 perf;;\n \t*)\n-\t\tBUG \"unhandled ref format $GIT_DEFAULT_REF_FORMAT\";;\n+\t\tBUG \"unhandled ref format $GIT_DEFAULT_REF_STORAGE\";;\n \tesac\n '\n \ndiff --git a/t/t1423-ref-backend.sh b/t/t1423-ref-backend.sh\nindex 20545d9db8..e8285548ca 100755\n--- a/t/t1423-ref-backend.sh\n+++ b/t/t1423-ref-backend.sh\n@@ -12,7 +12,7 @@ test_description='Test reference backend URIs'\n # is the new URI to be set for the ref storage.\n # is the git subcommand to be run in the repository.\n # if 'config', set the backend via the 'extensions.refStorage' config.\n-# if 'env', set the backend via the 'GIT_REFERENCE_BACKEND' env.\n+# if 'env', set the backend via the 'GIT_REF_STORAGE' env.\n run_with_uri () {\n \trepo=$1 &&\n \tbackend=$2 &&\n@@ -23,7 +23,7 @@ run_with_uri () {\n \tgit -C \"$repo\" config set core.repositoryformatversion 1 &&\n \tif test \"$via\" = \"env\"\n \tthen\n-\t\ttest_env GIT_REFERENCE_BACKEND=\"$uri\" git -C \"$repo\" $cmd\n+\t\ttest_env GIT_REF_STORAGE=\"$uri\" git -C \"$repo\" $cmd\n \telif test \"$via\" = \"config\"\n \tthen\n \t\tgit -C \"$repo\" config set extensions.refStorage \"$uri\" &&\n@@ -40,7 +40,7 @@ run_with_uri () {\n # is the original ref storage of the repo.\n # is the new URI to be set for the ref storage.\n # if 'config', set the backend via the 'extensions.refStorage' config.\n-# if 'env', set the backend via the 'GIT_REFERENCE_BACKEND' env.\n+# if 'env', set the backend via the 'GIT_REF_STORAGE' env.\n # (optional) if set, check if 'git-refs(1)' failed with the provided msg.\n test_refs_backend () {\n \trepo=$1 &&\n@@ -54,7 +54,7 @@ test_refs_backend () {\n \tthen\n \t\tif test \"$via\" = \"env\"\n \t\tthen\n-\t\t\ttest_env GIT_REFERENCE_BACKEND=\"$uri\" test_must_fail git -C \"$repo\" refs list 2>err\n+\t\t\ttest_env GIT_REF_STORAGE=\"$uri\" test_must_fail git -C \"$repo\" refs list 2>err\n \t\telif test \"$via\" = \"config\"\n \t\tthen\n \t\t\tgit -C \"$repo\" config set extensions.refStorage \"$uri\" &&\n@@ -83,7 +83,7 @@ verify_files_exist () {\n \ttest_cmp expect $gitdir/HEAD\n \n \t# verify that backend specific files exist.\n-\tcase \"$GIT_DEFAULT_REF_FORMAT\" in\n+\tcase \"$GIT_DEFAULT_REF_STORAGE\" in\n \tfiles)\n \t\ttest_path_is_dir $refdir/refs/heads &&\n \t\ttest_path_is_file $refdir/HEAD;;\n@@ -91,7 +91,7 @@ verify_files_exist () {\n \t\ttest_path_is_dir $refdir/reftable &&\n \t\ttest_path_is_file $refdir/reftable/tables.list;;\n \t*)\n-\t\tBUG \"unhandled ref format $GIT_DEFAULT_REF_FORMAT\";;\n+\t\tBUG \"unhandled ref format $GIT_DEFAULT_REF_STORAGE\";;\n \tesac\n }\n \n@@ -210,7 +210,7 @@ do\n \ttest_expect_success \"migrating repository to $to_format with alternate refs directory\" '\n \t\ttest_when_finished \"rm -rf repo refdir\" &&\n \t\tmkdir refdir &&\n-\t\tGIT_REFERENCE_BACKEND=\"${from_format}://$(pwd)/refdir\" git init repo &&\n+\t\tGIT_REF_STORAGE=\"${from_format}://$(pwd)/refdir\" git init repo &&\n \t\t(\n \t\t\tcd repo &&\n \n@@ -235,7 +235,7 @@ test_expect_success 'initializing repository with alt ref directory' '\n \ttest_when_finished \"rm -rf repo refdir\" &&\n \tmkdir refdir &&\n \tBACKEND=\"$(test_detect_ref_format)://$(pwd)/refdir\" &&\n-\tGIT_REFERENCE_BACKEND=$BACKEND git init repo &&\n+\tGIT_REF_STORAGE=$BACKEND git init repo &&\n \tverify_files_exist repo/.git refdir &&\n \t(\n \t\tcd repo &&\n@@ -264,7 +264,7 @@ test_expect_success 'cloning repository with alt ref directory' '\n \ttest_commit -C source 3 &&\n \n \tBACKEND=\"$(test_detect_ref_format)://$(pwd)/refdir\" &&\n-\tGIT_REFERENCE_BACKEND=$BACKEND git clone source repo &&\n+\tGIT_REF_STORAGE=$BACKEND git clone source repo &&\n \n \tgit -C repo config get extensions.refstorage >actual &&\n \techo $BACKEND >expect &&\ndiff --git a/t/t7424-submodule-mixed-ref-formats.sh b/t/t7424-submodule-mixed-ref-formats.sh\nindex 4d03b71243..50bcde2544 100755\n--- a/t/t7424-submodule-mixed-ref-formats.sh\n+++ b/t/t7424-submodule-mixed-ref-formats.sh\n@@ -12,7 +12,7 @@ test_ref_format () {\n \n for OTHER_FORMAT in files reftable\n do\n-\tif test \"$OTHER_FORMAT\" = \"$GIT_DEFAULT_REF_FORMAT\"\n+\tif test \"$OTHER_FORMAT\" = \"$GIT_DEFAULT_REF_STORAGE\"\n \tthen\n \t\tcontinue\n \tfi\n@@ -43,7 +43,7 @@ test_expect_success 'add submodules with different ref storage format' '\n \tgit init submodule &&\n \ttest_commit -C submodule submodule-initial &&\n \tgit init upstream &&\n-\ttest_ref_format upstream \"$GIT_DEFAULT_REF_FORMAT\" &&\n+\ttest_ref_format upstream \"$GIT_DEFAULT_REF_STORAGE\" &&\n \tgit -C upstream submodule add --ref-storage=\"$OTHER_FORMAT\" \"file://$(pwd)/submodule\" &&\n \ttest_ref_format upstream/submodule \"$OTHER_FORMAT\"\n '\n@@ -59,8 +59,8 @@ test_expect_success 'recursive clone propagates ref storage format' '\n \n \t# The upstream repository and its submodule should be using the default\n \t# ref format.\n-\ttest_ref_format upstream \"$GIT_DEFAULT_REF_FORMAT\" &&\n-\ttest_ref_format upstream/submodule \"$GIT_DEFAULT_REF_FORMAT\" &&\n+\ttest_ref_format upstream \"$GIT_DEFAULT_REF_STORAGE\" &&\n+\ttest_ref_format upstream/submodule \"$GIT_DEFAULT_REF_STORAGE\" &&\n \n \t# The cloned repositories should use the other ref format that we have\n \t# specified via `--ref-storage`. The option should propagate to cloned\n@@ -81,7 +81,7 @@ test_expect_success 'clone submodules with different ref storage format' '\n \tgit -C upstream commit -m \"upstream submodule\" &&\n \n \tgit clone --no-recurse-submodules \"file://$(pwd)/upstream\" downstream &&\n-\ttest_ref_format downstream \"$GIT_DEFAULT_REF_FORMAT\" &&\n+\ttest_ref_format downstream \"$GIT_DEFAULT_REF_STORAGE\" &&\n \tgit -C downstream submodule update --init --ref-storage=$OTHER_FORMAT &&\n \ttest_ref_format downstream/submodule \"$OTHER_FORMAT\"\n '\n@@ -98,7 +98,7 @@ test_expect_success 'status with mixed submodule ref storages' '\n \n \t# The main repository should use the default ref format now, whereas\n \t# the submodule should use the other format.\n-\ttest_ref_format main \"$GIT_DEFAULT_REF_FORMAT\" &&\n+\ttest_ref_format main \"$GIT_DEFAULT_REF_STORAGE\" &&\n \ttest_ref_format main/submodule \"$OTHER_FORMAT\" &&\n \n \tcat >expect <<-EOF &&\n@@ -123,7 +123,7 @@ test_expect_success 'recursive pull with mixed formats' '\n \t# submodules have different formats.\n \tgit clone --no-recurse-submodules \"file://$(pwd)/upstream\" downstream &&\n \tgit -C downstream submodule update --init --ref-storage=$OTHER_FORMAT &&\n-\ttest_ref_format downstream \"$GIT_DEFAULT_REF_FORMAT\" &&\n+\ttest_ref_format downstream \"$GIT_DEFAULT_REF_STORAGE\" &&\n \ttest_ref_format downstream/submodule \"$OTHER_FORMAT\" &&\n \n \t# Update the upstream submodule as well as the owning repository such\ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex 1f0505e412..3a8b5ef167 100644\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -575,8 +575,8 @@ export EDITOR\n GIT_TEST_BUILTIN_HASH=$(\"$GIT_BINARY\" version --build-options | sed -ne 's/^default-hash: //p')\n GIT_DEFAULT_HASH=\"${GIT_TEST_DEFAULT_HASH:-$GIT_TEST_BUILTIN_HASH}\"\n export GIT_DEFAULT_HASH\n-GIT_DEFAULT_REF_FORMAT=\"${GIT_TEST_DEFAULT_REF_FORMAT:-files}\"\n-export GIT_DEFAULT_REF_FORMAT\n+GIT_DEFAULT_REF_STORAGE=\"${GIT_TEST_DEFAULT_REF_FORMAT:-files}\"\n+export GIT_DEFAULT_REF_STORAGE\n \n # Tests using GIT_TRACE typically don't want : output\n GIT_TRACE_BARE=1\n@@ -1752,13 +1752,13 @@ parisc* | hppa*)\n \t;;\n esac\n \n-case \"$GIT_DEFAULT_REF_FORMAT\" in\n+case \"$GIT_DEFAULT_REF_STORAGE\" in\n files)\n \ttest_set_prereq REFFILES;;\n reftable)\n \ttest_set_prereq REFTABLE;;\n *)\n-\techo 2>&1 \"error: unknown ref format $GIT_DEFAULT_REF_FORMAT\"\n+\techo 2>&1 \"error: unknown ref format $GIT_DEFAULT_REF_STORAGE\"\n \texit 1\n \t;;\n esac\n\n-- \n2.55.0.1007.g17ff1f9808.dirty\n\n"},{"id":"551951","messageId":"20260904-b4-pks-unify-ref-storage-format-v1-10-08144e5004ff@pks.im","threadId":"66270","inReplyTo":"20260904-b4-pks-unify-ref-storage-format-v1-0-08144e5004ff@pks.im","subject":"[PATCH 10/11] setup: rename \"init.defaultRefFormat\" to \"init.defaultRefStorage\"","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-09-04T10:36:11Z","receivedAt":"2026-09-04T10:36:39Z","isPatch":true,"body":"With the same reasoning as for git-init(1), rename the\n\"init.defaultRefFormat\" config option to \"init.defaultRefStorage\" and\nkeep the old name as an alias.\n\nSigned-off-by: Patrick Steinhardt \n---\n Documentation/BreakingChanges.adoc | 2 +-\n Documentation/config/feature.adoc | 2 +-\n Documentation/config/init.adoc | 2 +-\n setup.c | 8 +++++---\n t/t0001-init.sh | 16 ++++++++--------\n 5 files changed, 16 insertions(+), 14 deletions(-)\n\ndiff --git a/Documentation/BreakingChanges.adoc b/Documentation/BreakingChanges.adoc\nindex 73bb939359..af69f5c1e2 100644\n--- a/Documentation/BreakingChanges.adoc\n+++ b/Documentation/BreakingChanges.adoc\n@@ -156,7 +156,7 @@ Cf. <2f5de416-04ba-c23d-1e0b-83bb655829a7@zombino.com>,\n \"packed-refs\" file.\n +\n Users that get immediate benefit from the \"reftable\" backend could continue to\n-opt-in to the \"reftable\" format manually by setting the \"init.defaultRefFormat\"\n+opt-in to the \"reftable\" format manually by setting the \"init.defaultRefStorage\"\n config. But defaults matter, and we think that overall users will have a better\n experience with less platform-specific quirks when they use the new backend by\n default.\ndiff --git a/Documentation/config/feature.adoc b/Documentation/config/feature.adoc\nindex 924f5ff4e3..7687e1a89a 100644\n--- a/Documentation/config/feature.adoc\n+++ b/Documentation/config/feature.adoc\n@@ -25,7 +25,7 @@ reusing objects from multiple packs instead of just one.\n significantly smaller in the presence of certain filename collisions with Git's\n default name-hash.\n +\n-* `init.defaultRefFormat=reftable` causes newly initialized repositories to use\n+* `init.defaultRefStorage=reftable` causes newly initialized repositories to use\n the reftable format for storing references. This new format solves issues with\n case-insensitive filesystems, compresses better and performs significantly\n better with many use cases. Refer to Documentation/technical/reftable.adoc for\ndiff --git a/Documentation/config/init.adoc b/Documentation/config/init.adoc\nindex 3098e033ac..297c09cf43 100644\n--- a/Documentation/config/init.adoc\n+++ b/Documentation/config/init.adoc\n@@ -13,7 +13,7 @@ endif::[]\n \t`--object-format=` in linkgit:git-init[1]. Both the command line option\n \tand the `GIT_DEFAULT_HASH` environment variable take precedence over\n \tthis config.\n-`init.defaultRefFormat`::\n+`init.defaultRefStorage`::\n \tAllows overriding the default ref storage format for new repositories.\n \tSee `--ref-storage=` in linkgit:git-init[1]. Both the command line\n \toption and the `GIT_DEFAULT_REF_STORAGE` environment variable take\ndiff --git a/setup.c b/setup.c\nindex 5de2aa0d2f..b81d4f134a 100644\n--- a/setup.c\n+++ b/setup.c\n@@ -2697,7 +2697,8 @@ static int read_default_format_config(const char *key, const char *value,\n \t\tgoto out;\n \t}\n \n-\tif (!strcmp(key, \"init.defaultrefformat\")) {\n+\tif (!strcmp(key, \"init.defaultrefstorage\") ||\n+\t !strcmp(key, \"init.defaultrefformat\")) {\n \t\tret = git_config_string(&str, key, value);\n \t\tif (ret)\n \t\t\tgoto out;\n@@ -2709,7 +2710,7 @@ static int read_default_format_config(const char *key, const char *value,\n \n \t/*\n \t * Enable the reftable format when \"features.experimental\" is enabled.\n-\t * \"init.defaultRefFormat\" takes precedence over this setting.\n+\t * \"init.defaultRefStorage\" takes precedence over this setting.\n \t */\n \tif (!strcmp(key, \"feature.experimental\") &&\n \t cfg->ref_storage_format == REF_STORAGE_FORMAT_UNKNOWN &&\n@@ -2781,7 +2782,8 @@ static void repository_format_configure(struct repository_format *repo_fmt,\n \t * equivalent \"GIT_DEFAULT_REF_FORMAT\".\n \t *\n \t * 5. The default ref storage format for new repositories as\n-\t * configured via \"init.defaultRefFormat\"\n+\t * configured via \"init.defaultRefStorage\" or its deprecated\n+\t * equivalent \"init.defaultRefFormat\".\n \t *\n \t * 6. Otherwise, we fall back to the default ref storage format\n \t * compiled into Git.\ndiff --git a/t/t0001-init.sh b/t/t0001-init.sh\nindex e4b9fae8bd..b481d763ff 100755\n--- a/t/t0001-init.sh\n+++ b/t/t0001-init.sh\n@@ -659,9 +659,9 @@ test_expect_success 'GIT_REF_STORAGE refuses to reinitialize with different stor\n \ttest_cmp expect err\n '\n \n-test_expect_success 'init warns about invalid init.defaultRefFormat' '\n+test_expect_success 'init warns about invalid init.defaultRefStorage' '\n \ttest_when_finished \"rm -rf repo\" &&\n-\ttest_config_global init.defaultRefFormat garbage &&\n+\ttest_config_global init.defaultRefStorage garbage &&\n \n \techo \"warning: unknown ref storage format ${SQ}garbage${SQ}\" >expect &&\n \tgit init repo 2>err &&\n@@ -714,9 +714,9 @@ do\n \t\ttest_cmp expect actual\n \t'\n \n-\ttest_expect_success \"init with init.defaultRefFormat=$format\" '\n+\ttest_expect_success \"init with init.defaultRefStorage=$format\" '\n \t\ttest_when_finished \"rm -rf refformat\" &&\n-\t\ttest_config_global init.defaultRefFormat $format &&\n+\t\ttest_config_global init.defaultRefStorage $format &&\n \t\t(\n \t\t\tsane_unset GIT_DEFAULT_REF_STORAGE &&\n \t\t\tgit init refformat\n@@ -753,9 +753,9 @@ test_expect_success \"--ref-storage= overrides GIT_DEFAULT_REF_STORAGE\" '\n \ttest_cmp expect actual\n '\n \n-test_expect_success \"GIT_DEFAULT_REF_STORAGE= overrides init.defaultRefFormat\" '\n+test_expect_success \"GIT_DEFAULT_REF_STORAGE= overrides init.defaultRefStorage\" '\n \ttest_when_finished \"rm -rf refformat\" &&\n-\ttest_config_global init.defaultRefFormat files &&\n+\ttest_config_global init.defaultRefStorage files &&\n \n \tGIT_DEFAULT_REF_STORAGE=reftable git init refformat &&\n \techo reftable >expect &&\n@@ -775,10 +775,10 @@ test_expect_success \"init with feature.experimental=true\" '\n \ttest_cmp expect actual\n '\n \n-test_expect_success \"init.defaultRefFormat overrides feature.experimental=true\" '\n+test_expect_success \"init.defaultRefStorage overrides feature.experimental=true\" '\n \ttest_when_finished \"rm -rf refformat\" &&\n \ttest_config_global feature.experimental true &&\n-\ttest_config_global init.defaultRefFormat files &&\n+\ttest_config_global init.defaultRefStorage files &&\n \t(\n \t\tsane_unset GIT_DEFAULT_REF_STORAGE &&\n \t\tgit init refformat\n\n-- \n2.55.0.1007.g17ff1f9808.dirty\n\n"},{"id":"551952","messageId":"20260904-b4-pks-unify-ref-storage-format-v1-11-08144e5004ff@pks.im","threadId":"66270","inReplyTo":"20260904-b4-pks-unify-ref-storage-format-v1-0-08144e5004ff@pks.im","subject":"[PATCH 11/11] setup: allow \"git init --ref-storage=\" to specify a payload","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-09-04T10:36:12Z","receivedAt":"2026-09-04T10:36:42Z","isPatch":true,"body":"Reference storage backends can be configured with a payload via the\n\"extensions.refStorage\" config key and the \"GIT_REF_STORAGE\" environment\nvariable, both of which accept a URI in the format\n\"://\". The payload may contain backend-specific\ninformation, for example an alternate refs directory or which database\nreferences should be stored in.\n\nThe `--ref-storage=` option of git-init(1) and git-clone(1) does not\nknow about payloads though: its value is parsed as a plain format name,\nso backends that require a payload cannot be conveniently set up at\ninitialization time via the command line.\n\nTeach the option to accept the same URI syntax. Also, document the\noptional payloads for both the \"files\" and \"reftable\" backends.\n\nSigned-off-by: Patrick Steinhardt \n---\n Documentation/git-init.adoc | 5 ++++-\n Documentation/ref-storage-format.adoc | 8 ++++++--\n builtin/clone.c | 4 ++--\n builtin/init-db.c | 9 +--------\n setup.c | 14 +++++++++-----\n setup.h | 2 +-\n t/t0001-init.sh | 2 +-\n t/t1423-ref-backend.sh | 30 ++++++++++++++++++++++++++++++\n 8 files changed, 54 insertions(+), 20 deletions(-)\n\ndiff --git a/Documentation/git-init.adoc b/Documentation/git-init.adoc\nindex 54cff89dfe..182fc7c203 100644\n--- a/Documentation/git-init.adoc\n+++ b/Documentation/git-init.adoc\n@@ -58,7 +58,10 @@ values are `sha1` and (if enabled) `sha256`. `sha1` is the default.\n include::object-format-disclaimer.adoc[]\n \n `--ref-storage=`::\n-Specify the given ref storage __ for the repository. The valid values are:\n+Specify the given ref storage __ for the repository. Backends that\n+require additional configuration accept a payload in the form\n+`://`, for example a connection string identifying the\n+database that shall store the references. The valid values are:\n +\n include::ref-storage-format.adoc[]\n \ndiff --git a/Documentation/ref-storage-format.adoc b/Documentation/ref-storage-format.adoc\nindex c5e29ec831..21d62557b7 100644\n--- a/Documentation/ref-storage-format.adoc\n+++ b/Documentation/ref-storage-format.adoc\n@@ -1,8 +1,12 @@\n-`files`;; for loose files with packed-refs.\n+`files[://]`;; for loose files with packed-refs. The optional payload can\n+be specified to change the root directory where references are created. A\n+relative path will be resolved relative to the repository's common directory.\n ifndef::with-breaking-changes[]\n \tThis is the default.\n endif::with-breaking-changes[]\n-`reftable`;; for the reftable format.\n+`reftable[://]`;; for the reftable format. The optional payload can\n+be specified to change the root directory where references are created. A\n+relative path will be resolved relative to the repository's common directory.\n ifdef::with-breaking-changes[]\n \tThis is the default.\n endif::with-breaking-changes[]\ndiff --git a/builtin/clone.c b/builtin/clone.c\nindex c4f9dc7472..ce54088c51 100644\n--- a/builtin/clone.c\n+++ b/builtin/clone.c\n@@ -1030,7 +1030,7 @@ int cmd_clone(int argc,\n \t\toption_single_branch = deepen ? 1 : 0;\n \n \tif (ref_storage) {\n-\t\tref_storage_format = ref_storage_format_by_name(ref_storage);\n+\t\tref_storage_format = ref_storage_format_by_uri(ref_storage, NULL);\n \t\tif (ref_storage_format == REF_STORAGE_FORMAT_UNKNOWN)\n \t\t\tdie(_(\"unknown ref storage format '%s'\"), ref_storage);\n \t}\n@@ -1188,7 +1188,7 @@ int cmd_clone(int argc,\n \t * their on-disk data structures.\n \t */\n \tinit_db(the_repository, git_dir, real_git_dir, work_tree, option_template,\n-\t\tGIT_HASH_UNKNOWN, ref_storage_format, NULL,\n+\t\tGIT_HASH_UNKNOWN, ref_storage, NULL,\n \t\tdo_not_override_repo_unix_permissions,\n \t\tINIT_DB_QUIET | INIT_DB_SKIP_REFDB);\n \ndiff --git a/builtin/init-db.c b/builtin/init-db.c\nindex 763ee47d21..e30da2936a 100644\n--- a/builtin/init-db.c\n+++ b/builtin/init-db.c\n@@ -86,7 +86,6 @@ int cmd_init_db(int argc,\n \tconst char *ref_storage = NULL;\n \tconst char *initial_branch = NULL;\n \tint hash_algo = GIT_HASH_UNKNOWN;\n-\tenum ref_storage_format ref_storage_format = REF_STORAGE_FORMAT_UNKNOWN;\n \tint init_shared_repository = -1;\n \tconst struct option init_db_options[] = {\n \t\tOPT_STRING(0, \"template\", &template_dir, N_(\"template-directory\"),\n@@ -175,12 +174,6 @@ int cmd_init_db(int argc,\n \t\t\tdie(_(\"unknown hash algorithm '%s'\"), object_format);\n \t}\n \n-\tif (ref_storage) {\n-\t\tref_storage_format = ref_storage_format_by_name(ref_storage);\n-\t\tif (ref_storage_format == REF_STORAGE_FORMAT_UNKNOWN)\n-\t\t\tdie(_(\"unknown ref storage format '%s'\"), ref_storage);\n-\t}\n-\n \tif (init_shared_repository != -1)\n \t\trepo_settings_set_shared_repository(the_repository, init_shared_repository);\n \n@@ -251,7 +244,7 @@ int cmd_init_db(int argc,\n \n \tflags |= INIT_DB_EXIST_OK;\n \tret = init_db(the_repository, git_dir, real_git_dir, work_tree,\n-\t\t template_dir, hash_algo, ref_storage_format, initial_branch,\n+\t\t template_dir, hash_algo, ref_storage, initial_branch,\n \t\t init_shared_repository, flags);\n \n \tfree(template_dir_to_free);\ndiff --git a/setup.c b/setup.c\nindex b81d4f134a..20a2fbb292 100644\n--- a/setup.c\n+++ b/setup.c\n@@ -2727,7 +2727,7 @@ static int read_default_format_config(const char *key, const char *value,\n }\n \n static void repository_format_configure(struct repository_format *repo_fmt,\n-\t\t\t\t\tint hash, enum ref_storage_format ref_storage_format)\n+\t\t\t\t\tint hash, const char *ref_storage_uri)\n {\n \tstruct default_format_config cfg = {\n \t\t.hash = GIT_HASH_UNKNOWN,\n@@ -2738,6 +2738,7 @@ static void repository_format_configure(struct repository_format *repo_fmt,\n \t\t.ignore_repo = 1,\n \t\t.ignore_worktree = 1,\n \t};\n+\tenum ref_storage_format ref_storage_format;\n \tchar *ref_storage_payload = NULL;\n \tconst char *env;\n \n@@ -2788,8 +2789,11 @@ static void repository_format_configure(struct repository_format *repo_fmt,\n \t * 6. Otherwise, we fall back to the default ref storage format\n \t * compiled into Git.\n \t */\n-\tif (ref_storage_format != REF_STORAGE_FORMAT_UNKNOWN) {\n-\t\t/* nothing to do */\n+\tif (ref_storage_uri) {\n+\t\tref_storage_format = ref_storage_format_by_uri(ref_storage_uri, &ref_storage_payload);\n+\t\tif (ref_storage_format == REF_STORAGE_FORMAT_UNKNOWN)\n+\t\t\tdie(_(\"unknown reference storage format specified via command line: '%s'\"),\n+\t\t\t ref_storage_uri);\n \t} else if (((env = getenv(GIT_REF_STORAGE_ENVIRONMENT)) ||\n \t\t (env = getenv(GIT_REFERENCE_BACKEND_ENVIRONMENT)))) {\n \t\tref_storage_format = ref_storage_format_by_uri(env, &ref_storage_payload);\n@@ -2834,7 +2838,7 @@ int init_db(struct repository *repo,\n \t const char *real_git_dir,\n \t const char *worktree,\n \t const char *template_dir, int hash,\n-\t enum ref_storage_format ref_storage_format,\n+\t const char *ref_storage_uri,\n \t const char *initial_branch,\n \t int init_shared_repository, unsigned int flags)\n {\n@@ -2871,7 +2875,7 @@ int init_db(struct repository *repo,\n \t * is an attempt to reinitialize new repository with an old tool.\n \t */\n \tread_and_verify_repository_format(&repo_fmt, repo_get_git_dir(repo), NULL);\n-\trepository_format_configure(&repo_fmt, hash, ref_storage_format);\n+\trepository_format_configure(&repo_fmt, hash, ref_storage_uri);\n \tif (apply_repository_format(repo, &repo_fmt, APPLY_REPOSITORY_FORMAT_HONOR_ENV, &err) < 0)\n \t\tdie(\"%s\", err.buf);\n \ndiff --git a/setup.h b/setup.h\nindex 763fd384e8..79e0640743 100644\n--- a/setup.h\n+++ b/setup.h\n@@ -265,7 +265,7 @@ int init_db(struct repository *repo,\n \t const char *real_git_dir,\n \t const char *worktree,\n \t const char *template_dir, int hash_algo,\n-\t enum ref_storage_format ref_storage_format,\n+\t const char *ref_storage_uri,\n \t const char *initial_branch, int init_shared_repository,\n \t unsigned int flags);\n void initialize_repository_version(struct repository *repo,\ndiff --git a/t/t0001-init.sh b/t/t0001-init.sh\nindex b481d763ff..7cdebc8ff3 100755\n--- a/t/t0001-init.sh\n+++ b/t/t0001-init.sh\n@@ -833,7 +833,7 @@ done\n test_expect_success 'init with --ref-storage=garbage' '\n \ttest_when_finished \"rm -rf refformat\" &&\n \tcat >expect <<-EOF &&\n-\tfatal: unknown ref storage format ${SQ}garbage${SQ}\n+\tfatal: unknown reference storage format specified via command line: ${SQ}garbage${SQ}\n \tEOF\n \ttest_must_fail git init --ref-storage=garbage refformat 2>err &&\n \ttest_cmp expect err\ndiff --git a/t/t1423-ref-backend.sh b/t/t1423-ref-backend.sh\nindex e8285548ca..dc43e1c438 100755\n--- a/t/t1423-ref-backend.sh\n+++ b/t/t1423-ref-backend.sh\n@@ -254,6 +254,36 @@ test_expect_success 'initializing repository with alt ref directory' '\n \t)\n '\n \n+test_expect_success 'initializing repository with --ref-storage and payload' '\n+\ttest_when_finished \"rm -rf repo refdir\" &&\n+\tmkdir refdir &&\n+\tBACKEND=\"$(test_detect_ref_format)://$(pwd)/refdir\" &&\n+\tgit init --ref-storage=\"$BACKEND\" repo &&\n+\tverify_files_exist repo/.git refdir &&\n+\n+\tgit -C repo config get extensions.refstorage >actual &&\n+\techo $BACKEND >expect &&\n+\ttest_cmp expect actual &&\n+\n+\ttest_commit -C repo 1 &&\n+\tgit -C repo refs list >out &&\n+\ttest_grep \"refs/tags/1\" out &&\n+\n+\t# Reinitializing the repository is fine when not specifying any format.\n+\tgit -C repo init &&\n+\t# Reinitializing with the same backend is fine, too.\n+\tgit -C repo init --ref-storage=\"$BACKEND\" &&\n+\t# Reinitializing without a payload should fail.\n+\ttest_must_fail git -C repo init --ref-storage=\"$(test_detect_ref_format)\" 2>err &&\n+\ttest_grep \"attempt to reinitialize repository with different reference storage payload\" err &&\n+\t# Reinitializing with a different payload should fail, too.\n+\ttest_must_fail git -C repo init --ref-storage=\"$(test_detect_ref_format)://$(pwd)/other\" 2>err &&\n+\ttest_grep \"attempt to reinitialize repository with different reference storage payload\" err &&\n+\n+\tgit -C repo config get extensions.refstorage >actual &&\n+\ttest_cmp expect actual\n+'\n+\n test_expect_success 'cloning repository with alt ref directory' '\n \ttest_when_finished \"rm -rf source repo refdir\" &&\n \tmkdir refdir &&\n\n-- \n2.55.0.1007.g17ff1f9808.dirty\n\n"},{"id":"551958","messageId":"CAOLa=ZQO05kg6ekVJf-0Hkmq8rMVQuGox6O7DJL6mMTRA7_HLw@mail.gmail.com","threadId":"66270","inReplyTo":"20260904-b4-pks-unify-ref-storage-format-v1-1-08144e5004ff@pks.im","subject":"Re: [PATCH 01/11] builtin/init: rename \"--ref-format=\" to \"--ref-storage=\"","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2026-09-04T13:05:20Z","receivedAt":"2026-09-04T13:05:21Z","isPatch":true,"body":"Patrick Steinhardt writes:\n\n> Back when we gained support for reftables we of course introduced the\n> ability to control the reference storage format that is used by newly\n> created repositories. This infrastructure has grown over time, and\n> unfortunately without consistency:\n>\n> - The command line parameter to specify the ref storage format is\n> called \"--ref-format=\", while the corresponding repository extension\n> is called \"refStorage\".\n>\n> - In most cases we refer to the \"ref storage format\" in our docs, so\n> calling it \"--ref-format=\" is being inconsistent with them.\n>\n> - It is possible to override the ref storage format via an environment\n> variable that is called \"GIT_REFERENCE_BACKEND\", which is not even\n> remotely consistent with anything else.\n>\n> - There is also an \"object format\", but that format does not control\n> how we store objects but rather whether we use SHA1 or SHA256.\n>\n> So in summary, it's a huge mess.\n>\n> This problem is about to become even worse though, as we're soon going\n> to introduce an object storage extension. This extension is the\n> equivalent to the ref storage extension, and of course we also want\n> users to be able to control which object storage format new repositories\n> are using. But we cannot properly name that parameter without creating\n> even more inconsistencies:\n>\n> - \"--object-format=\" would match \"--ref-format=\", but that parameter\n> name is already taken to specify the hash function.\n>\n> - \"--object-storage=\" would be a good fit, but be inconsistent with\n> \"--ref-format=\". Asking the user to execute `git init --ref-format=\n> --object-storage=` just feels extremely awkward.\n>\n> Instead, this and subsequent patches will fix the mess by consistently\n> referring to the ref storage format as \"ref storage\" throughout all\n> options, environment variables and config settings. This new name much\n> more closely indicates that it is about how we store data and finally\n> brings consistency into this area. We will keep the old names working of\n> course for the sake of backwards compatibility.\n>\n> Start with git-init(1).\n>\n> Signed-off-by: Patrick Steinhardt \n> ---\n> Documentation/config/init.adoc | 2 +-\n> Documentation/git-init.adoc | 4 ++--\n> Documentation/git.adoc | 2 +-\n> builtin/init-db.c | 16 ++++++++-------\n> t/perf/p1401-ref-store-tombstones.sh | 4 ++--\n> t/perf/perf-lib.sh | 2 +-\n> t/t0001-init.sh | 24 +++++++++++------------\n> t/t0610-reftable-basics.sh | 14 ++++++-------\n> t/t0611-reftable-httpd.sh | 2 +-\n> t/t1400-update-ref.sh | 2 +-\n> t/t1423-ref-backend.sh | 6 +++---\n> t/t1460-refs-migrate.sh | 36 +++++++++++++++++-----------------\n> t/t1900-repo-info.sh | 6 +++---\n> t/t5510-fetch.sh | 8 ++++----\n> t/t7424-submodule-mixed-ref-formats.sh | 2 +-\n> 15 files changed, 66 insertions(+), 64 deletions(-)\n>\n> diff --git a/Documentation/config/init.adoc b/Documentation/config/init.adoc\n> index 7b4abdaf8b..9c78440192 100644\n> --- a/Documentation/config/init.adoc\n> +++ b/Documentation/config/init.adoc\n> @@ -15,7 +15,7 @@ endif::[]\n> \tthis config.\n> `init.defaultRefFormat`::\n> \tAllows overriding the default ref storage format for new repositories.\n> -\tSee `--ref-format=` in linkgit:git-init[1]. Both the command line\n> +\tSee `--ref-storage=` in linkgit:git-init[1]. Both the command line\n> \toption and the `GIT_DEFAULT_REF_FORMAT` environment variable take\n> \tprecedence over this config.\n\n[snip]\n\n> @@ -83,7 +83,7 @@ int cmd_init_db(int argc,\n> \tunsigned int flags = 0;\n> \tint bare = startup_info->force_bare_repository ? 1 : -1;\n> \tconst char *object_format = NULL;\n> -\tconst char *ref_format = NULL;\n> +\tconst char *ref_storage = NULL;\n> \tconst char *initial_branch = NULL;\n> \tint hash_algo = GIT_HASH_UNKNOWN;\n> \tenum ref_storage_format ref_storage_format = REF_STORAGE_FORMAT_UNKNOWN;\n> @@ -109,8 +109,10 @@ int cmd_init_db(int argc,\n> \t\t\t N_(\"override the name of the initial branch\")),\n> \t\tOPT_STRING(0, \"object-format\", &object_format, N_(\"hash\"),\n> \t\t\t N_(\"specify the hash algorithm to use\")),\n> -\t\tOPT_STRING(0, \"ref-format\", &ref_format, N_(\"format\"),\n> -\t\t\t N_(\"specify the reference format to use\")),\n> +\t\tOPT_STRING(0, \"ref-storage\", &ref_storage, N_(\"format\"),\n> +\t\t\t N_(\"specify the reference storage format to use\")),\n\nshouldn't we use 'ref-storage' for the argh value too?\n\n> +\t\tOPT_STRING_F(0, \"ref-format\", &ref_storage, N_(\"format\"),\n> +\t\t\t N_(\"specify the reference storage format to use\"), PARSE_OPT_HIDDEN),\n> \t\tOPT_END()\n> \t};\n>\n\nSo we stay backwards compatible by leaving the old 'ref-format' as is.\nMakes sense.\n\n> \tint ret;\n> @@ -173,10 +175,10 @@ int cmd_init_db(int argc,\n> \t\t\tdie(_(\"unknown hash algorithm '%s'\"), object_format);\n> \t}\n>\n> -\tif (ref_format) {\n> -\t\tref_storage_format = ref_storage_format_by_name(ref_format);\n> +\tif (ref_storage) {\n> +\t\tref_storage_format = ref_storage_format_by_name(ref_storage);\n> \t\tif (ref_storage_format == REF_STORAGE_FORMAT_UNKNOWN)\n> -\t\t\tdie(_(\"unknown ref storage format '%s'\"), ref_format);\n> +\t\t\tdie(_(\"unknown ref storage format '%s'\"), ref_storage);\n\nFunny that we error'd out with 'ref storage' while the name was\nref_format.\n\n> \t}\n>\n> \tif (init_shared_repository != -1)\n[snip]\n"},{"id":"551959","messageId":"CAOLa=ZR3xtwK_EzxjaOc0qN0oE51oDaKk4UMBTJqP+g+exr-Dg@mail.gmail.com","threadId":"66270","inReplyTo":"20260904-b4-pks-unify-ref-storage-format-v1-7-08144e5004ff@pks.im","subject":"Re: [PATCH 07/11] refs: expose function to parse reference URIs","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2026-09-04T13:12:35Z","receivedAt":"2026-09-04T13:12:37Z","isPatch":true,"body":"Patrick Steinhardt writes:\n\n> In the next commit we're about to add more sites that want to parse a\n> reference backends URI into a format and payload. Expose a new function\n> `ref_storage_format_by_uri()` that enables this.\n>\n> Signed-off-by: Patrick Steinhardt \n> ---\n> refs.c | 23 +++++++++++++++++++++++\n> refs.h | 4 ++++\n> setup.c | 48 ++++++++++++------------------------------------\n> 3 files changed, 39 insertions(+), 36 deletions(-)\n>\n> diff --git a/refs.c b/refs.c\n> index 92d5df5b71..951db56113 100644\n> --- a/refs.c\n> +++ b/refs.c\n> @@ -54,6 +54,29 @@ enum ref_storage_format ref_storage_format_by_name(const char *name)\n> \treturn REF_STORAGE_FORMAT_UNKNOWN;\n> }\n>\n> +enum ref_storage_format ref_storage_format_by_uri(const char *uri,\n> +\t\t\t\t\t\t char **payload)\n> +{\n> +\tenum ref_storage_format format;\n> +\tconst char *schema_end;\n> +\tchar *name;\n> +\n> +\tschema_end = strstr(uri, \"://\");\n> +\tif (!schema_end) {\n> +\t\tname = xstrdup(uri);\n> +\t\tif (payload)\n> +\t\t\t*payload = NULL;\n> +\t} else {\n> +\t\tname = xstrndup(uri, schema_end - uri);\n> +\t\tif (payload)\n> +\t\t\t*payload = xstrdup(schema_end + 3);\n> +\t}\n> +\n> +\tformat = ref_storage_format_by_name(name);\n> +\tfree(name);\n> +\treturn format;\n> +}\n> +\n\nOkay, we move the existing code in setup.c to the refs.c and clean it\nup.\n\n> const char *ref_storage_format_to_name(enum ref_storage_format ref_storage_format)\n> {\n> \tconst struct ref_storage_be *be = find_ref_storage_backend(ref_storage_format);\n> diff --git a/refs.h b/refs.h\n> index 9979446d15..ee3b8a62ef 100644\n> --- a/refs.h\n> +++ b/refs.h\n> @@ -17,6 +17,10 @@ struct worktree;\n> enum ref_storage_format ref_storage_format_by_name(const char *name);\n> const char *ref_storage_format_to_name(enum ref_storage_format ref_storage_format);\n>\n> +/* Parse a reference storage URI in the format \"[://]\". */\n> +enum ref_storage_format ref_storage_format_by_uri(const char *uri,\n> +\t\t\t\t\t\t char **payload);\n> +\n> enum ref_transaction_error {\n> \t/* Default error code */\n> \tREF_TRANSACTION_ERROR_GENERIC = -1,\n> diff --git a/setup.c b/setup.c\n> index dfe05d9a03..3be7dac452 100644\n> --- a/setup.c\n> +++ b/setup.c\n> @@ -632,21 +632,6 @@ static enum extension_result handle_extension_v0(const char *var,\n> \t\treturn EXTENSION_UNKNOWN;\n> }\n>\n> -static void parse_reference_uri(const char *value, char **format,\n> -\t\t\t\tchar **payload)\n> -{\n> -\tconst char *schema_end;\n> -\n> -\tschema_end = strstr(value, \"://\");\n> -\tif (!schema_end) {\n> -\t\t*format = xstrdup(value);\n> -\t\t*payload = NULL;\n> -\t} else {\n> -\t\t*format = xstrndup(value, schema_end - value);\n> -\t\t*payload = xstrdup_or_null(schema_end + 3);\n> -\t}\n> -}\n> -\n> /*\n> * Record any new extensions in this function.\n> */\n> @@ -689,16 +674,13 @@ static enum extension_result handle_extension(const char *var,\n> \t\treturn EXTENSION_OK;\n> \t} else if (!strcmp(ext, \"refstorage\")) {\n> \t\tunsigned int format;\n> -\t\tchar *format_str;\n>\n> \t\tif (!value)\n> \t\t\treturn config_error_nonbool(var);\n>\n> -\t\tparse_reference_uri(value, &format_str,\n> -\t\t\t\t &data->ref_storage_payload);\n> -\n> -\t\tformat = ref_storage_format_by_name(format_str);\n> -\t\tfree(format_str);\n> +\t\tFREE_AND_NULL(data->ref_storage_payload);\n> +\t\tformat = ref_storage_format_by_uri(value,\n> +\t\t\t\t\t\t &data->ref_storage_payload);\n>\n> \t\tif (format == REF_STORAGE_FORMAT_UNKNOWN)\n> \t\t\treturn error(_(\"invalid value for '%s': '%s'\"),\n> @@ -2069,16 +2051,12 @@ const char *setup_git_directory_gently(struct repository *repo, int *nongit_ok)\n> \t\t\t */\n> \t\t\tref_backend_uri = getenv(GIT_REFERENCE_BACKEND_ENVIRONMENT);\n> \t\t\tif (ref_backend_uri) {\n> -\t\t\t\tchar *format;\n> -\n> -\t\t\t\tfree(discovery.format.ref_storage_payload);\n> -\n> -\t\t\t\tparse_reference_uri(ref_backend_uri, &format, &discovery.format.ref_storage_payload);\n> -\t\t\t\tdiscovery.format.ref_storage_format = ref_storage_format_by_name(format);\n> +\t\t\t\tFREE_AND_NULL(discovery.format.ref_storage_payload);\n> +\t\t\t\tdiscovery.format.ref_storage_format =\n> +\t\t\t\t\tref_storage_format_by_uri(ref_backend_uri,\n> +\t\t\t\t\t\t\t\t &discovery.format.ref_storage_payload);\n> \t\t\t\tif (discovery.format.ref_storage_format == REF_STORAGE_FORMAT_UNKNOWN)\n> -\t\t\t\t\tdie(_(\"unknown ref storage format: '%s'\"), format);\n> -\n> -\t\t\t\tfree(format);\n> +\t\t\t\t\tdie(_(\"unknown ref storage format: '%s'\"), ref_backend_uri);\n> \t\t\t}\n>\n> \t\t\tif (apply_repository_format(repo, &discovery.format,\n> @@ -2806,18 +2784,16 @@ static void repository_format_configure(struct repository_format *repo_fmt,\n>\n> \tref_backend_uri = getenv(GIT_REFERENCE_BACKEND_ENVIRONMENT);\n> \tif (ref_backend_uri) {\n> -\t\tchar *backend, *payload;\n> \t\tenum ref_storage_format format;\n> +\t\tchar *payload;\n>\n> -\t\tparse_reference_uri(ref_backend_uri, &backend, &payload);\n> -\t\tformat = ref_storage_format_by_name(backend);\n> +\t\tformat = ref_storage_format_by_uri(ref_backend_uri, &payload);\n> \t\tif (format == REF_STORAGE_FORMAT_UNKNOWN)\n> -\t\t\tdie(_(\"unknown ref storage format: '%s'\"), backend);\n> +\t\t\tdie(_(\"unknown ref storage format: '%s'\"), ref_backend_uri);\n>\n> \t\trepo_fmt->ref_storage_format = format;\n> +\t\tfree(repo_fmt->ref_storage_payload);\n> \t\trepo_fmt->ref_storage_payload = payload;\n> -\n> -\t\tfree(backend);\n> \t}\n> }\n>\n>\n> --\n> 2.55.0.1007.g17ff1f9808.dirty\n\nThen, modify all the call sites to use the new function. Makes sense.\n"},{"id":"551960","messageId":"CAOLa=ZT7WQ-J-i6n_nqm0MtDypm3V=3jyG6y6a8U=EvicMqgow@mail.gmail.com","threadId":"66270","inReplyTo":"20260904-b4-pks-unify-ref-storage-format-v1-9-08144e5004ff@pks.im","subject":"Re: [PATCH 09/11] setup: rename ref storage format environment variables","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2026-09-04T13:20:30Z","receivedAt":"2026-09-04T13:20:34Z","isPatch":true,"body":"Patrick Steinhardt writes:\n\n> With the same reasoning as for git-init(1), rename the environment\n> variables GIT_REFERENCE_BACKEND and GIT_DEFAULT_REF_FORMAT to\n> GIT_REF_STORAGE and GIT_DEFAULT_REF_STORAGE, respectively. The old names\n> are kept as an alias to retain compatibility.\n>\n> Signed-off-by: Patrick Steinhardt \n> ---\n> Documentation/config/init.adoc | 2 +-\n> Documentation/git.adoc | 6 ++--\n> environment.h | 1 +\n> setup.c | 21 ++++++++------\n> t/t0001-init.sh | 50 +++++++++++++++++-----------------\n> t/t1419-exclude-refs.sh | 16 +++++------\n> t/t1423-ref-backend.sh | 18 ++++++------\n> t/t7424-submodule-mixed-ref-formats.sh | 14 +++++-----\n> t/test-lib.sh | 8 +++---\n> 9 files changed, 71 insertions(+), 65 deletions(-)\n>\n> diff --git a/Documentation/config/init.adoc b/Documentation/config/init.adoc\n> index 9c78440192..3098e033ac 100644\n> --- a/Documentation/config/init.adoc\n> +++ b/Documentation/config/init.adoc\n> @@ -16,7 +16,7 @@ endif::[]\n> `init.defaultRefFormat`::\n> \tAllows overriding the default ref storage format for new repositories.\n> \tSee `--ref-storage=` in linkgit:git-init[1]. Both the command line\n> -\toption and the `GIT_DEFAULT_REF_FORMAT` environment variable take\n> +\toption and the `GIT_DEFAULT_REF_STORAGE` environment variable take\n> \tprecedence over this config.\n>\n> init.defaultSubmodulePathConfig::\n> diff --git a/Documentation/git.adoc b/Documentation/git.adoc\n> index e3260fde68..e34c74d995 100644\n> --- a/Documentation/git.adoc\n> +++ b/Documentation/git.adoc\n> @@ -590,13 +590,13 @@ double-quotes and respecting backslash escapes. E.g., the value\n> \tis always used. The default is \"sha1\".\n> \tSee `--object-format` in linkgit:git-init[1].\n>\n> -`GIT_DEFAULT_REF_FORMAT`::\n> +`GIT_DEFAULT_REF_STORAGE`::\n> \tIf this variable is set, the default reference backend format for new\n> \trepositories will be set to this value. The default is \"files\".\n> \tSee `--ref-storage` in linkgit:git-init[1].\n>\n> -`GIT_REFERENCE_BACKEND`::\n> - Specify which reference backend to be used along with its URI.\n> +`GIT_REF_STORAGE`::\n> + Specify which ref storage to be used along with its URI.\n> See `extensions.refStorage` option in linkgit:git-config[1] for more\n> details. Overrides the config variable when used.\n>\n> diff --git a/environment.h b/environment.h\n> index e7ec5b0437..e6b933f8db 100644\n> --- a/environment.h\n> +++ b/environment.h\n> @@ -44,6 +44,7 @@\n> #define GIT_TEXT_DOMAIN_DIR_ENVIRONMENT \"GIT_TEXTDOMAINDIR\"\n> #define GIT_ATTR_SOURCE_ENVIRONMENT \"GIT_ATTR_SOURCE\"\n> #define GIT_REFERENCE_BACKEND_ENVIRONMENT \"GIT_REFERENCE_BACKEND\"\n> +#define GIT_REF_STORAGE_ENVIRONMENT \"GIT_REF_STORAGE\"\n\nShouldn't we also be adding and using\nGIT_DEFAULT_REF_STORAGE_ENVIRONMENT? The rest of the changes look to be\nin order.\n\n[snip]\n"},{"id":"551961","messageId":"CAOLa=ZTi_ZdEZ+hDXXoyf_U875-zwUHBydDhu1wjXYGHQANXfg@mail.gmail.com","threadId":"66270","inReplyTo":"20260904-b4-pks-unify-ref-storage-format-v1-0-08144e5004ff@pks.im","subject":"Re: [PATCH 00/11] Fix inconsistent ref storage format terminology","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2026-09-04T13:23:47Z","receivedAt":"2026-09-04T13:23:50Z","isPatch":true,"body":"Patrick Steinhardt writes:\n\n> Hi,\n>\n> back when we gained support for reftables we of course introduced the\n> ability to control the reference storage format that is used by newly\n> created repositories. This infrastructure has grown over time, and\n> unfortunately without a lot of consistency:\n>\n> - The command line parameter to specify the ref storage format is\n> called \"--ref-format=\", while the corresponding repository extension\n> is called \"refStorage\".\n>\n> - In most cases we refer to the \"ref storage format\" in our docs, so\n> calling it \"--ref-format=\" is inconsistent with them.\n>\n> - It is possible to override the ref storage format via an environment\n> variable that is called \"GIT_REFERENCE_BACKEND\", which is not even\n> remotely consistent with anything else.\n>\n> - There is also an \"object format\", but that format does not control\n> how we store objects but rather whether we use SHA1 or SHA256.\n>\n> So in summary, it's a huge mess.\n>\n> This problem is about to become even worse though, as we're soon going\n> to introduce an object storage extension. This extension is the\n> equivalent to the ref storage extension, and of course we also want\n> users to be able to control which object storage format new repositories\n> are using. But we cannot properly name that parameter without creating\n> even more inconsistencies:\n>\n> - \"--object-format=\" would match \"--ref-format=\", but that parameter\n> name is already taken to specify the hash function.\n>\n> - \"--object-storage=\" would be a good fit, but be inconsistent with\n> \"--ref-format=\". Asking the user to execute `git init\n> --ref-format=reftable --object-format=sha256 --object-storage=foo`\n> just feels extremely awkward.\n>\n> So this patch series aims to clean up this huge mess that we (well, to a\n> large extent I) have created, by bringing consistency to our command\n> line switches, environment variables and config options to all use \"ref\n> storage\" instead. And that also paves the way for the eventual \"object\n> storage\" switches.\n>\n> As a cherry on top, this patch series also extends the \"--ref-storage=\"\n> switch to allow URIs in the form of \"files://foo/bar\" to bring it in\n> line with all the other ways to specify the ref storage format that\n> already allow for URIs.\n>\n> Thanks!\n>\n> Patrick\n>\n\nThis was relatively quite an easy read compared to the number of\npatches. I have a small question and a nit. Looks good otherwise :)\n"},{"id":"551990","messageId":"xmqq8q5h3plt.fsf@gitster.g","threadId":"66270","inReplyTo":"20260904-b4-pks-unify-ref-storage-format-v1-0-08144e5004ff@pks.im","subject":"Re: [PATCH 00/11] Fix inconsistent ref storage format terminology","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-09-04T17:15:10Z","receivedAt":"2026-09-04T17:15:12Z","isPatch":true,"body":"Patrick Steinhardt writes:\n\n> Hi,\n>\n> back when we gained support for reftables we of course introduced the\n> ability to control the reference storage format that is used by newly\n> created repositories. This infrastructure has grown over time, and\n> unfortunately without a lot of consistency:\n>\n> - The command line parameter to specify the ref storage format is\n> called \"--ref-format=\", while the corresponding repository extension\n> is called \"refStorage\".\n>\n> - In most cases we refer to the \"ref storage format\" in our docs, so\n> calling it \"--ref-format=\" is inconsistent with them.\n>\n> - It is possible to override the ref storage format via an environment\n> variable that is called \"GIT_REFERENCE_BACKEND\", which is not even\n> remotely consistent with anything else.\n>\n> - There is also an \"object format\", but that format does not control\n> how we store objects but rather whether we use SHA1 or SHA256.\n>\n> So in summary, it's a huge mess.\n\nUnless you are unifying them all into a single ref-storage-format, I\ndo not see much practical difference between ref-storage and\nref-format. They are both with insufficient clarity and details.\n\nref-format fails to convey \"format\" of what aspect of ref it is\nabout (among \"storage\", \"name\", and others), ref-storage fails to\nconvey what aspect of ref storage it is talking about (among\n\"format\", \"medium\", and others).\n\n"},{"id":"552117","messageId":"ap6LPf0Ks1xTTp4z@pks.im","threadId":"66270","inReplyTo":"xmqq8q5h3plt.fsf@gitster.g","subject":"Re: [PATCH 00/11] Fix inconsistent ref storage format terminology","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-09-07T10:00:29Z","receivedAt":"2026-09-07T10:00:40Z","isPatch":true,"body":"On Fri, Sep 04, 2026 at 10:15:10AM -0700, Junio C Hamano wrote:\n> Patrick Steinhardt writes:\n> \n> > Hi,\n> >\n> > back when we gained support for reftables we of course introduced the\n> > ability to control the reference storage format that is used by newly\n> > created repositories. This infrastructure has grown over time, and\n> > unfortunately without a lot of consistency:\n> >\n> > - The command line parameter to specify the ref storage format is\n> > called \"--ref-format=\", while the corresponding repository extension\n> > is called \"refStorage\".\n> >\n> > - In most cases we refer to the \"ref storage format\" in our docs, so\n> > calling it \"--ref-format=\" is inconsistent with them.\n> >\n> > - It is possible to override the ref storage format via an environment\n> > variable that is called \"GIT_REFERENCE_BACKEND\", which is not even\n> > remotely consistent with anything else.\n> >\n> > - There is also an \"object format\", but that format does not control\n> > how we store objects but rather whether we use SHA1 or SHA256.\n> >\n> > So in summary, it's a huge mess.\n> \n> Unless you are unifying them all into a single ref-storage-format, I\n> do not see much practical difference between ref-storage and\n> ref-format. They are both with insufficient clarity and details.\n\nWell, the important difference is that we don't have conflicting\nconcerns of \"--ref-format=\" and \"--object-format=\" anymore, where the\nformer cares about the storage format and the latter cares about how the\nobjects themselves look.\n\n> ref-format fails to convey \"format\" of what aspect of ref it is\n> about (among \"storage\", \"name\", and others), ref-storage fails to\n> convey what aspect of ref storage it is talking about (among\n> \"format\", \"medium\", and others).\n\nIn any case, I'm happy to call this \"ref-storage-format\" instead. I\ndon't care too much about the naming, I really only want to fix the\nscope conflict we have with the above two flags, and be consistent.\nResolving that scope conflict gives us a path forward for introducing\nthe object storage format extension and its accompanying flags.\n\nSo with your suggestion, it would be:\n\n - \"--ref-storage-format=\" and \"--object-storage-format=\" control the\n storage format used by Git.\n\n - \"--object-format=\" would continue to control the hash used for\n objects. This is still a tiny bit messy, as it could've been called\n \"--object-hash=\" if you ask me. But on the other, maybe we at one\n point in the future we will introduce an actual new representation\n for objects? If so, it gives us a bit more flexibility.\n\nWill send a new version along these lines. Thanks!\n\nPatrick\n"},{"id":"552118","messageId":"ap6LTHNgPGAVyZDu@pks.im","threadId":"66270","inReplyTo":"CAOLa=ZQO05kg6ekVJf-0Hkmq8rMVQuGox6O7DJL6mMTRA7_HLw@mail.gmail.com","subject":"Re: [PATCH 01/11] builtin/init: rename \"--ref-format=\" to \"--ref-storage=\"","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-09-07T10:00:44Z","receivedAt":"2026-09-07T10:00:49Z","isPatch":true,"body":"On Fri, Sep 04, 2026 at 09:05:20AM -0400, Karthik Nayak wrote:\n> Patrick Steinhardt writes:\n> > diff --git a/Documentation/config/init.adoc b/Documentation/config/init.adoc\n> > index 7b4abdaf8b..9c78440192 100644\n> > --- a/Documentation/config/init.adoc\n> > +++ b/Documentation/config/init.adoc\n> > @@ -109,8 +109,10 @@ int cmd_init_db(int argc,\n> > \t\t\t N_(\"override the name of the initial branch\")),\n> > \t\tOPT_STRING(0, \"object-format\", &object_format, N_(\"hash\"),\n> > \t\t\t N_(\"specify the hash algorithm to use\")),\n> > -\t\tOPT_STRING(0, \"ref-format\", &ref_format, N_(\"format\"),\n> > -\t\t\t N_(\"specify the reference format to use\")),\n> > +\t\tOPT_STRING(0, \"ref-storage\", &ref_storage, N_(\"format\"),\n> > +\t\t\t N_(\"specify the reference storage format to use\")),\n> \n> shouldn't we use 'ref-storage' for the argh value too?\n\nI think having \"format\" as parameter name makes more sense. In any case,\ngoing by Junio's suggestion I've now renamed everything to ref storage\nformat, and that makes \"format\" an even better parameter name, I think.\n\n> > @@ -173,10 +175,10 @@ int cmd_init_db(int argc,\n> > \t\t\tdie(_(\"unknown hash algorithm '%s'\"), object_format);\n> > \t}\n> >\n> > -\tif (ref_format) {\n> > -\t\tref_storage_format = ref_storage_format_by_name(ref_format);\n> > +\tif (ref_storage) {\n> > +\t\tref_storage_format = ref_storage_format_by_name(ref_storage);\n> > \t\tif (ref_storage_format == REF_STORAGE_FORMAT_UNKNOWN)\n> > -\t\t\tdie(_(\"unknown ref storage format '%s'\"), ref_format);\n> > +\t\t\tdie(_(\"unknown ref storage format '%s'\"), ref_storage);\n> \n> Funny that we error'd out with 'ref storage' while the name was\n> ref_format.\n\nWell, it's inconsistencies all over the place :)\n\nPatrick\n"},{"id":"552119","messageId":"ap6LUs6-5h0oui3l@pks.im","threadId":"66270","inReplyTo":"CAOLa=ZT7WQ-J-i6n_nqm0MtDypm3V=3jyG6y6a8U=EvicMqgow@mail.gmail.com","subject":"Re: [PATCH 09/11] setup: rename ref storage format environment variables","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-09-07T10:00:50Z","receivedAt":"2026-09-07T10:00:56Z","isPatch":true,"body":"On Fri, Sep 04, 2026 at 09:20:30AM -0400, Karthik Nayak wrote:\n> Patrick Steinhardt writes:\n> > diff --git a/environment.h b/environment.h\n> > index e7ec5b0437..e6b933f8db 100644\n> > --- a/environment.h\n> > +++ b/environment.h\n> > @@ -44,6 +44,7 @@\n> > #define GIT_TEXT_DOMAIN_DIR_ENVIRONMENT \"GIT_TEXTDOMAINDIR\"\n> > #define GIT_ATTR_SOURCE_ENVIRONMENT \"GIT_ATTR_SOURCE\"\n> > #define GIT_REFERENCE_BACKEND_ENVIRONMENT \"GIT_REFERENCE_BACKEND\"\n> > +#define GIT_REF_STORAGE_ENVIRONMENT \"GIT_REF_STORAGE\"\n> \n> Shouldn't we also be adding and using\n> GIT_DEFAULT_REF_STORAGE_ENVIRONMENT? The rest of the changes look to be\n> in order.\n\nI refrained from doing so because the other variable wasn't listed here,\neither, so I was mostly aiming for compatibility with the previous code.\nHappy to change though if you feel strongly about it.\n\nPatrick\n"}]}