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

Re: [PATCH v2 3/3] repository: move 'repository_format_worktree_config' to repo scope

From
Glen Choo <chooglen@google.com>
Date
Jun 12, 2023, 21:37 UTC
Message-ID
<kl6lo7lkfjk9.fsf@chooglen-macbookpro.roam.corp.google.com>
In-Reply-To
<xmqqedmveqs2.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
Show 23 quoted lines
> That's quite a departure from the established practice, isn't it?
> Due to recent and not so recent header shuffling (moving everything
> out of cache.h, dropping "extern", etc.), "git blame" is a bit hard
> to follow, but ever since 16ac8b8d (setup: introduce the
> discover_git_directory() function, 2017-03-13) added the function,
> we do execute the "setup" when we know we are in a repository.
>
> It would probably be worth mentioning that the "global state" Dscho
> refers to in that commit is primarily about the current directory of
> the Git process.  During the discovery, we used to go up one level
> at a time and tried to see if the current directory is either the
> top of the working tree (i.e.  has ".git/" that is a git repository)
> or the top of a GIT_DIR-looking directory.  That was changed in
> ce9b8aab (setup_git_directory_1(): avoid changing global state,
> 2017-03-13) in the same series and discusses what "global state" the
> series addresses.
>
> If a relatively recent and oddball caller calls the function when it
> does not want any of the setup donw after finding out that we could
> use the directory as a repository, a new early "pure discovery" part
> should be split out of the function, and both the function itself
> and the oddball caller should be taught to call that pure-discovery
> helper, I think.

Hm, isn't discover_git_directory() that pure-discovery helper? In the ce9b8aab, Dscho created stateless machinery (setup_git_directory_1()), and in 16ac8b8d, he used that stateless machinery to create a pure-discovery helper (discover_git_directory()).

It's true that the global state is primarily the cwd, but the spirit of the change is the same - setup_git_directory_1() should have no global side effects and neither should discover_git_diretory() (since it's supposed to only do discovery).

Previous: Junio C HamanoNext: Victoria Dye
Message 18 of 29 in “Fix behavior of worktree config in submodules”
  1. 0/2 Fix behavior of worktree config in submodulesVictoria Dye via GitGitGadget, May 23, 2023
  2. 1/2 config: use gitdir to get worktree configVictoria Dye via GitGitGadget, May 23, 2023
  3. Glen ChooMay 25, 2023
  4. Derrick StoleeMay 25, 2023
  5. 2/2 repository: move 'repository_format_worktree_config' to repo scopeVictoria Dye via GitGitGadget, May 23, 2023
  6. Glen ChooMay 25, 2023
  7. Glen ChooMay 25, 2023
  8. Victoria DyeMay 25, 2023
  9. Derrick StoleeMay 25, 2023
  10. Junio C HamanoMay 24, 2023
  11. Glen ChooMay 25, 2023
  12. 0/3 Fix behavior of worktree config in submodulesVictoria Dye via GitGitGadget, May 26, 2023
  13. 1/3 config: use gitdir to get worktree configVictoria Dye via GitGitGadget, May 26, 2023
  14. 2/3 config: pass 'repo' directly to 'config_with_options()'Victoria Dye via GitGitGadget, May 26, 2023
  15. 3/3 repository: move 'repository_format_worktree_config' to repo scopeVictoria Dye via GitGitGadget, May 26, 2023
  16. Glen ChooMay 31, 2023
  17. Junio C HamanoJun 1, 2023
  18. Glen ChooJun 12, 2023
  19. Victoria DyeJun 7, 2023
  20. Glen ChooJun 12, 2023
  21. Victoria DyeJun 12, 2023
  22. Glen ChooJun 12, 2023
  23. setup: copy repository_format using helperGlen Choo, Jun 12, 2023
  24. Victoria DyeJun 13, 2023
  25. Glen ChooJun 13, 2023
  26. Junio C HamanoJun 13, 2023
  27. Derrick StoleeMay 26, 2023
  28. Glen ChooJun 13, 2023
  29. Victoria DyeJun 13, 2023

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.