git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 0/7] setup: drop global state

From
Justin Tobler <jltobler@gmail.com>
Date
Jun 11, 2026, 15:47 UTC
Message-ID
<airVOrTboNDDGBak@denethor>
In-Reply-To
<20260611-b4-pks-setup-drop-global-state-v2-0-a6f7269c841d@pks.im>
On 26/06/11 08:44AM, Patrick Steinhardt wrote:
Show 21 quoted lines
> Hi,
> 
> this patch series continues to refactor "setup.c", where the focus is to
> drop remaining global state that we have in "setup.c". The most
> important consequence of this is that we don't need to rely on
> `the_repository` in `is_bare_repository()` anymore.
> 
> This series is built on top of 1ff279f340 (The 13th batch, 2026-06-09)
> with ps/setup-centralize-odb-creation at 42b9d3dc9d (setup: construct
> object database in `apply_repository_format()`, 2026-06-04) merged into
> it.
> 
> Changes in v2:
>   - Improve documentation for some aspects of `check_repository_format_gently()`.
>   - Link to v1: https://patch.msgid.link/20260610-b4-pks-setup-drop-global-state-v1-0-5dff3eec8f06@pks.im
> 
> Thanks!
> 
> Patrick
> 
> ---
[snip]
Show 16 quoted lines
> Range-diff versus v1:
> 
> 1:  0281a4bca9 = 1:  96b71f5223 builtin/init: stop modifying global `git_work_tree_cfg` variable
> 2:  6fdc8d77e8 = 2:  a51c0ff79d builtin/init: simplify logic to configure worktree
> 3:  ce31595ff5 ! 3:  e06393ddc5 setup: remove global `git_work_tree_cfg` variable
>     @@ Commit message
>          Refactor the code so that we instead use the worktree configuration as
>          discovered via the repository format. Drop the global variable.
>      
>     +    Note that in `check_repository_format_gently()` we now have to free the
>     +    candidate work tree variable. This change is required to retain previous
>     +    semantics: before we essentially had an implicit `else` branch where we
>     +    set `git_work_tree_cfg = NULL`, but we were able to elide that branch
>     +    because we already knew that it would be `NULL` anyway. Now that we use
>     +    the candidate work tree directly to populate the repository's work tree
>     +    though we have to clear it to retain those semantics.
I find the additional explaination here quite helpful. Thanks.
Show 16 quoted lines
>          Signed-off-by: Patrick Steinhardt <ps@pks.im>
>      
>       ## setup.c ##
> 4:  6a69dc853c = 4:  628ed54c8c builtin/init: stop modifying `is_bare_repository_cfg`
> 5:  afa2d8bbda ! 5:  02ceaf4a20 environment: split up concerns of `is_bare_repository_cfg`
>     @@ setup.c: static int check_repository_format_gently(const char *gitdir,
>      +		 * dictate bareness; it is inherited from the main worktree.
>      +		 */
>      +		candidate->is_bare = -1;
>     ++
>     ++		/*
>     ++		 * Furthermore, "core.worktree" is supposed to be ignored when
>     ++		 * we have a commondir configured, unless it comes from the
>     ++		 * per-worktree configuration.
>     ++		 */
>       		FREE_AND_NULL(candidate->work_tree);

Ok, so when we have a commondir set we need to clear `candidate->work_tree` since we need to ignore core.worktree configuration in such cases. Makes sense.

The changes in this version of the series looks good to me.
-Justin
Previous: Patrick SteinhardtNext: Toon Claes
Message 30 of 33 in “setup: drop global state”
  1. 0/7 setup: drop global statePatrick Steinhardt, Jun 10, 2026
  2. 1/7 builtin/init: stop modifying global `git_work_tree_cfg` variablePatrick Steinhardt, Jun 10, 2026
  3. Justin ToblerJun 10, 2026
  4. 2/7 builtin/init: simplify logic to configure worktreePatrick Steinhardt, Jun 10, 2026
  5. Justin ToblerJun 10, 2026
  6. 3/7 setup: remove global `git_work_tree_cfg` variablePatrick Steinhardt, Jun 10, 2026
  7. Justin ToblerJun 10, 2026
  8. Patrick SteinhardtJun 11, 2026
  9. 4/7 builtin/init: stop modifying `is_bare_repository_cfg`Patrick Steinhardt, Jun 10, 2026
  10. 5/7 environment: split up concerns of `is_bare_repository_cfg`Patrick Steinhardt, Jun 10, 2026
  11. Justin ToblerJun 10, 2026
  12. Patrick SteinhardtJun 11, 2026
  13. Justin ToblerJun 11, 2026
  14. 6/7 environment: stop using `the_repository` in `is_bare_repository()`Patrick Steinhardt, Jun 10, 2026
  15. 7/7 treewide: drop USE_THE_REPOSITORY_VARIABLEPatrick Steinhardt, Jun 10, 2026
  16. Justin ToblerJun 10, 2026
  17. Toon ClaesJun 12, 2026
  18. 0/7 setup: drop global statePatrick Steinhardt, Jun 11, 2026
  19. 1/7 builtin/init: stop modifying global `git_work_tree_cfg` variablePatrick Steinhardt, Jun 11, 2026
  20. Toon ClaesJun 12, 2026
  21. Patrick SteinhardtJun 12, 2026
  22. 2/7 builtin/init: simplify logic to configure worktreePatrick Steinhardt, Jun 11, 2026
  23. 3/7 setup: remove global `git_work_tree_cfg` variablePatrick Steinhardt, Jun 11, 2026
  24. 4/7 builtin/init: stop modifying `is_bare_repository_cfg`Patrick Steinhardt, Jun 11, 2026
  25. 5/7 environment: split up concerns of `is_bare_repository_cfg`Patrick Steinhardt, Jun 11, 2026
  26. Toon ClaesJun 12, 2026
  27. Patrick SteinhardtJun 12, 2026
  28. 6/7 environment: stop using `the_repository` in `is_bare_repository()`Patrick Steinhardt, Jun 11, 2026
  29. 7/7 treewide: drop USE_THE_REPOSITORY_VARIABLEPatrick Steinhardt, Jun 11, 2026
  30. Justin ToblerJun 11, 2026
  31. Toon ClaesJun 12, 2026
  32. Patrick SteinhardtJun 12, 2026
  33. Toon ClaesJun 16, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.