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

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

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Jun 13, 2017, 21:51 UTC
Message-ID
<20170613215138.GM133952@aiede.mtv.corp.google.com>
In-Reply-To
<20170613213815.GP154599@google.com>
Brandon Williams wrote:
> On 06/13, Jonathan Nieder wrote:
>> Brandon Williams wrote:
Show 28 quoted lines
>>> Commit 2185fde56 (config: handle conditional include when $GIT_DIR is
>>> not set up) added a 'git_dir' field to the config_options struct.  Let's
>>> use this option field explicitly all the time instead of occasionally
>>> falling back to calling 'git_pathdup("config")' to get the path to the
>>> local repository configuration.  This allows 'do_git_config_sequence()'
>>> to not implicitly rely on global repository state.
>>>
>>> Signed-off-by: Brandon Williams <bmwill@google.com>
>>> ---
>>>  builtin/config.c | 2 ++
>>>  config.c         | 6 ++----
>>>  2 files changed, 4 insertions(+), 4 deletions(-)
>>
>> The same comments as before still apply:
>>
>> - this changes API to make opts->git_dir mandatory, which is error prone
>>   and easily avoidable, e.g. by making git_dir an argument to
>>   git_config_with_options
>
> I still don't agree with this.  I have looked at all callers and ensured
> that 'git_dir' will be set when appropriate in the 'config_options'
> struct.  I find the notion ridiculous that I would need to change a
> function's name or arguments every time the internals of the function
> are adjusted or when an options struct obtains a new field.  Plus, there
> is already an aptly named parameter of type 'config_options' with which
> to hold options for the config machinery.  This struct is also added to
> in a later patch to include commondir so that the gitdir vs commondir
> issue can be resolved.

What is the next step, then? You can find the notion ridiculous but it's how this project has worked in my experience (and how other projects with similar patch-based workflows work).

I also don't really understand why it is so bad to have to care about API compatibility when it is so simple to do --- change the function signature or change the function name. That's all it takes.

Show 6 quoted lines
>> - the commit message doesn't say anything about to git dir vs common dir
>>   change.  It needs to, or even better, the switch to use common dir
>>   instead of git dir can happen as a separate patch.
>
> There really isn't any switching in this patch.  One of the following
> patches in this series addresses this problem in more detail though.
There is, because of the gitdir: behavior change.
Jonathan
Previous: Brandon WilliamsNext: Junio C Hamano
Message 38 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.