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

Re: [PATCH 4/4] config: don't implicitly use gitdir

From
BWBrandon Williams <bmwill@google.com>
Date
Jun 13, 2017, 14:43 UTC
Message-ID
<20170613144316.GK154599@google.com>
In-Reply-To
<20170613070813.v3vthqlqsga7djgz@sigill.intra.peff.net>
On 06/13, Jeff King wrote:
Show 19 quoted lines
> On Mon, Jun 12, 2017 at 11:16:27PM -0700, Brandon Williams wrote:
> 
> > > > *puzzled* Why wasn't this needed before, then?  The rest of the patch
> > > > should result in no functional change, but this part seems different.
> > > 
> > > Now I'm puzzled, too. The original that got filled in lazily by the
> > > config functions was always get_git_dir(). I can buy the argument that
> > > this was a bug (I'm not familiar enough with worktree to say one way or
> > > the other), but if it's a fix it should definitely go into another
> > > patch.
> > 
> > Well actually... in do_git_config_sequence 'git_path("config")' is
> > called which will convert gitdir to commondir under the hood.  you can't
> > use vanilla gitdir because the config isn't stored in a worktree's
> > gitdir but rather in the commondir as the config is shared by all
> > worktrees.
> 
> Sorry, I missed the fact that there were two sites changed on the first
> read.
Well I missed that fact when I first wrote these patches too :)
Show 8 quoted lines
> 
> > So maybe we actually need to add a field to the 'config_options' struct
> > of 'commondir' such that the commondir can be used to load the actual
> > config file and 'gitdir' can be used to handle the 'IncludeIf' stuff.
> 
> On reflection, I suspect that probably is the case. If you have a
> workdir in ~/foo, you probably want to match IncludeIf against that
> instead of wherever the common dir happens to be.

K I'll look into adding that then. I will say keeping track of 'commondir' vs 'gitdir' does get slightly confusing.

-- 
Brandon Williams
Previous: Jeff KingNext: Jonathan Nieder
Message 15 of 57 in “config.h”
  1. 0/4 config.hBrandon Williams, Jun 12, 2017
  2. 1/4 config: create config.hBrandon Williams, Jun 12, 2017
  3. 2/4 config: remove git_config_iterBrandon Williams, Jun 12, 2017
  4. Jonathan NiederJun 13, 2017
  5. Jeff KingJun 13, 2017
  6. 4/4 config: don't implicitly use gitdirBrandon Williams, Jun 12, 2017
  7. Jonathan NiederJun 13, 2017
  8. Brandon WilliamsJun 13, 2017
  9. Jonathan NiederJun 13, 2017
  10. Jonathan NiederJun 13, 2017
  11. Jeff KingJun 13, 2017
  12. Brandon WilliamsJun 13, 2017
  13. Jeff KingJun 13, 2017
  14. Jeff KingJun 13, 2017
  15. Brandon WilliamsJun 13, 2017
  16. Jonathan NiederJun 13, 2017
  17. Brandon WilliamsJun 13, 2017
  18. Jeff KingJun 13, 2017
  19. Brandon WilliamsJun 13, 2017
  20. 3/4 config: don't include config.h by defaultBrandon Williams, Jun 12, 2017
  21. Jeff KingJun 12, 2017
  22. Brandon WilliamsJun 12, 2017
  23. Jeff KingJun 12, 2017
  24. Brandon WilliamsJun 12, 2017
  25. Jonathan NiederJun 13, 2017
  26. 0/6 config.hBrandon Williams, Jun 13, 2017
  27. 1/6 config: create config.hBrandon Williams, Jun 13, 2017
  28. Jonathan NiederJun 13, 2017
  29. 2/6 config: remove git_config_iterBrandon Williams, Jun 13, 2017
  30. Jonathan NiederJun 13, 2017
  31. 5/6 setup: teach discover_git_directory to respect the commondirBrandon Williams, Jun 13, 2017
  32. Jeff KingJun 14, 2017
  33. Brandon WilliamsJun 14, 2017
  34. 6/6 config: respect commondirBrandon Williams, Jun 13, 2017
  35. 4/6 config: don't implicitly use gitdirBrandon Williams, Jun 13, 2017
  36. Jonathan NiederJun 13, 2017
  37. Brandon WilliamsJun 13, 2017
  38. Jonathan NiederJun 13, 2017
  39. Junio C HamanoJun 13, 2017
  40. Jonathan NiederJun 13, 2017
  41. Jacob KellerJun 14, 2017
  42. Jeff KingJun 14, 2017
  43. Brandon WilliamsJun 14, 2017
  44. 3/6 config: don't include config.h by defaultBrandon Williams, Jun 13, 2017
  45. Jonathan NiederJun 13, 2017
  46. 0/6 config.hBrandon Williams, Jun 14, 2017
  47. 1/6 config: create config.hBrandon Williams, Jun 14, 2017
  48. 2/6 config: remove git_config_iterBrandon Williams, Jun 14, 2017
  49. 4/6 setup: teach discover_git_directory to respect the commondirBrandon Williams, Jun 14, 2017
  50. 3/6 config: don't include config.h by defaultBrandon Williams, Jun 14, 2017
  51. 5/6 config: respect commondirBrandon Williams, Jun 14, 2017
  52. 6/6 config: don't implicitly use gitdir or commondirBrandon Williams, Jun 14, 2017
  53. Junio C HamanoJun 15, 2017
  54. Brandon WilliamsJun 15, 2017
  55. Junio C HamanoJun 15, 2017
  56. Brandon WilliamsJun 15, 2017
  57. Brandon WilliamsJun 16, 2017

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.