Skip to content

Introduce configs for default repo format

Patrick Steinhardt git 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest5 patches 2 repliesIn review
  2. v15 patches 10 repliesSuperseded

Changes in v2 from the cover letter

- Extend commit message to mention that we also move repo_set_ref_storage_format() and repo_set_hash_algo() into repository_format_configure().

- Extend commit message to explain precedence.

- Fix a grammar issue.

- Fix a copy/paste error in the documentation of init.defaultRefFormat.

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5t0001: exercise initialization with ref formats more thoroughlyt/t0001-init.sh+35 -130 replies
2/5t0001: delete repositories when object format tests finisht/t0001-init.sh+3 -00 replies
3/5setup: merge configuration of repository formatssetup.c+20 -270 replies
4/5setup: make object format configurable via configDocumentation/config/init.txt setup.c t/t0001-init.sh+95 -01 reply
5/5setup: make ref storage format configurable via configDocumentation/config/init.txt setup.c t/t0001-init.sh+63 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/5] Introduce configs for default repo format

Hi,

this is the second version of my patch series that introduces two new config settings init.defaultRefFormat and init.defaultObjectFormat to make the default formats configurable without environment variables.

Changes compared to v1:

- Extend commit message to mention that we also move repo_set_ref_storage_format() and repo_set_hash_algo() into repository_format_configure().

- Extend commit message to explain precedence.

- Fix a grammar issue.

- Fix a copy/paste error in the documentation of init.defaultRefFormat.

Thanks!

Patrick

Patrick Steinhardt (5):
t0001: exercise initialization with ref formats more thoroughly
t0001: delete repositories when object format tests finish
setup: merge configuration of repository formats
setup: make object format configurable via config
setup: make ref storage format configurable via config

 Documentation/config/init.txt |  10 +++
 setup.c                       | 101 ++++++++++++++++-------
 t/t0001-init.sh               | 145 +++++++++++++++++++++++++++++++---
 3 files changed, 216 insertions(+), 40 deletions(-)

Range-diff against v1:

1:  0d3844db32 = 1:  0d3844db32 t0001: exercise initialization with ref formats more thoroughly
2:  6b0cefef6a = 2:  6b0cefef6a t0001: delete repositories when object format tests finish
3:  16f52b75d8 ! 3:  ce0fad88bb setup: merge configuration of repository formats

@@ Commit message
or read the config multiple times. Both of these options feel a bit unwieldy.

- Merge the code into a new a new function repository_format_configure()
- that is responsible for configuring the whole repository's format. Like
- this, we can easily read the config in a single place, only.
+ Merge the code into a new function repository_format_configure() that
+ is responsible for configuring the whole repository's format. Like this,
+ we can easily read the config in a single place, only.
+
+ Furthermore, move the calls to repo_set_ref_storage_format() and
+ repo_set_hash_algo() into this new function as well, such that all the
+ logic to configure the repository format is self-contained here.

4: e1cdaf0f0e ! 4: 8508662062 setup: make object format configurable via config
@@ Commit message
"init.defaultObjectFormat", similar to "init.defaultBranch", that allows the user to configure the default object format when creating new repos.

+ The precedence order now is the following, where the first one wins:
+
+ 1. The --object-format= switch.
+
+ 2. The GIT_DEFAULT_HASH environment variable.
+
+ 3. The init.defaultObjectFormat config variable.
+
+ This matches the typical precedence order we use in Git. We typically
+ let the environment override the config such that the latter can easily
+ be overridden on an ephemeral basis, for example by scripts.
+

## Documentation/config/init.txt ##
5: a0417b7d1a ! 5: b68a841450 setup: make ref storage format configurable via config
@@ Metadata
## Commit message ##
setup: make ref storage format configurable via config

- Similar as the preceding commit, introduce a new "init.defaultRefFormat"
+ Similar to the preceding commit, introduce a new "init.defaultRefFormat"
config that allows the user to globally set the ref storage format used by newly created repositories.

@@ Documentation/config/init.txt: endif::[]
and the GIT_DEFAULT_HASH environment variable take precedence over this config.
+init.defaultRefFormat::
-+ Allows overriding the default object format for new repositories. See
-+ --ref-format= in linkgit:git-init[1]. Both the command line option
-+ and the GIT_DEFAULT_REF_FORMAT environment variable take precedence
-+ over this config.
++ Allows overriding the default ref storage format for new repositories.
++ See --ref-format= in linkgit:git-init[1]. Both the command line
++ option and the GIT_DEFAULT_REF_FORMAT environment variable take
++ precedence over this config.

## setup.c ##
@@ setup.c: static void separate_git_dir(const char *git_dir, const char *git_link)

Signature · 1 line
2.46.0.46.g406f326d27.dirty