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

Re: [PATCH 10/18] setup: stop using `the_repository` in `set_git_work_tree()`

From
Elijah Newren <newren@gmail.com>
Date
Apr 18, 2026, 01:16 UTC
Message-ID
<CABPp-BEe0oN3ZfV6ZhFSADWWj_zEAx0_JUhc=Qc76-aqpSOxTw@mail.gmail.com>
In-Reply-To
<20260330-pks-setup-wo-the-repository-v1-10-0d2e822837aa@pks.im>
On Mon, Mar 30, 2026 at 6:19 AM Patrick Steinhardt <ps@pks.im> wrote:
Show 20 quoted lines
>
> Stop using `the_repository` in `set_git_work_tree()` and instead accept
> the repository as a parameter. The injection of `the_repository` is thus
> bumped one level higher, where callers now pass it in explicitly.
>
> Similar as with the preceding commit, we track whether the worktree has
> been initialized already via a global variable so that we can die in
> case the repository is re-initialized with a different worktree path.
> Store this info in the `struct repository` instead so that we correctly
> handle this per repository.
>
> Signed-off-by: Patrick Steinhardt <ps@pks.im>
> ---
>  builtin/clone.c   |  2 +-
>  builtin/init-db.c |  6 +++---
>  repository.h      |  1 +
>  setup.c           | 24 +++++++++++-------------
>  setup.h           |  2 +-
>  5 files changed, 17 insertions(+), 18 deletions(-)
>
> diff --git a/repository.h b/repository.h
> index abeef3129e..7ae3d34484 100644
> --- a/repository.h
> +++ b/repository.h
[...]
> +       bool worktree_initialized;
> diff --git a/setup.c b/setup.c
[...]
>
> -static int git_work_tree_initialized;

Okay, so we replaced the global git_work_tree_intialized with a repository field named worktree_initialized, _and_ changed its type from int to bool...

> -       git_work_tree_initialized = 1;
> -       repo_set_worktree(the_repository, new_work_tree);
> +       repo->worktree_initialized = 1;
> +       repo_set_worktree(repo, new_work_tree);

...yet we still set it to "1". Shouldn't we initialize it to "true" given the typechange?

Previous: Patrick SteinhardtNext: Patrick Steinhardt
Message 18 of 31 in “setup: drop uses of `the_repository`”
  1. 00/18 setup: drop uses of `the_repository`Patrick Steinhardt, Mar 30, 2026
  2. 01/18 setup: replace use of `the_repository` in static functionsPatrick Steinhardt, Mar 30, 2026
  3. 02/18 setup: stop using `the_repository` in `is_inside_worktree()`Patrick Steinhardt, Mar 30, 2026
  4. Karthik NayakApr 9, 2026
  5. 03/18 setup: stop using `the_repository` in `is_inside_git_dir()`Patrick Steinhardt, Mar 30, 2026
  6. Karthik NayakApr 9, 2026
  7. Patrick SteinhardtApr 13, 2026
  8. Junio C HamanoApr 13, 2026
  9. 04/18 setup: stop using `the_repository` in `prefix_path()`Patrick Steinhardt, Mar 30, 2026
  10. 05/18 setup: stop using `the_repository` in `path_inside_repo()`Patrick Steinhardt, Mar 30, 2026
  11. 06/18 setup: stop using `the_repository` in `verify_filename()`Patrick Steinhardt, Mar 30, 2026
  12. 07/18 setup: stop using `the_repository` in `verify_non_filename()`Patrick Steinhardt, Mar 30, 2026
  13. 08/18 setup: stop using `the_repository` in `enter_repo()`Patrick Steinhardt, Mar 30, 2026
  14. 09/18 setup: stop using `the_repository` in `setup_work_tree()`Patrick Steinhardt, Mar 30, 2026
  15. Elijah NewrenApr 18, 2026
  16. Patrick SteinhardtApr 20, 2026
  17. 10/18 setup: stop using `the_repository` in `set_git_work_tree()`Patrick Steinhardt, Mar 30, 2026
  18. Elijah NewrenApr 18, 2026
  19. Patrick SteinhardtApr 20, 2026
  20. 11/18 setup: stop using `the_repository` in `setup_git_env()`Patrick Steinhardt, Mar 30, 2026
  21. 12/18 setup: stop using `the_repository` in `setup_git_directory_gently()`Patrick Steinhardt, Mar 30, 2026
  22. 13/18 setup: stop using `the_repository` in `setup_git_directory()`Patrick Steinhardt, Mar 30, 2026
  23. 14/18 setup: stop using `the_repository` in `upgrade_repository_format()`Patrick Steinhardt, Mar 30, 2026
  24. 15/18 setup: stop using `the_repository` in `check_repository_format()`Patrick Steinhardt, Mar 30, 2026
  25. Elijah NewrenApr 18, 2026
  26. Patrick SteinhardtApr 20, 2026
  27. 16/18 setup: stop using `the_repository` in `initialize_repository_version()`Patrick Steinhardt, Mar 30, 2026
  28. 17/18 setup: stop using `the_repository` in `create_reference_database()`Patrick Steinhardt, Mar 30, 2026
  29. 18/18 setup: stop using `the_repository` in `init_db()`Patrick Steinhardt, Mar 30, 2026
  30. Karthik NayakApr 9, 2026
  31. Patrick SteinhardtApr 13, 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.