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

Re: [PATCH (Apple Git) 12/13] Enable support for Xcode.app-bundled gitconfig

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Jan 31, 2019, 00:01 UTC
Message-ID
<20190131000137.GB23492@gmail.com>
In-Reply-To
<8507DB9E-A76E-4038-BDB6-110066865C1E@apple.com>
Hi,
Jeremy Huddleston Sequoia wrote:
Show 9 quoted lines
> Unfortunately, I was quick to celebrate.  This picks up the bundled
> file instead of a system-wide file.  I'd love it if we could still
> honor system-wide config/attributes in addition to
> RUNTIME_PREFIX-relative ones (eg: user overrides system which
> overrides distribution).  I worry that as is, we'd stop referencing
> the system-wide configs which might confuse users.
> 
> Is that something you'd be interested in, or should we just continue
> to maintain our separate patches?

For the internal deployment at Google, what we've done is to put an [include] path directive in the global gitconfig:

	[include]
		path = /usr/share/git-core/config

Users can edit the global git config in etc, but the distributed config at /usr/share/git-core/config is read-only as part of the distributed package.

We considered making an upstream change to bake in the distributed config in the git binary but decided that this way is a little nicer since it lets people comment out the include.path setting if they want to e.g. for experimentation. It's also more explicit (hence easier to understand).

Would a similar approach work for your setup? Can you say a little more about how you'd like things to work from an end-user pov?

Thanks, Jonathan

Previous: Jeremy Huddleston SequoiaNext: Jeremy Huddleston Sequoia
Message 47 of 63 in “Differences between git-2.20.1 and Apple Git-116”
  1. 00/13 Differences between git-2.20.1 and Apple Git-116Jeremy Huddleston Sequoia, Jan 29, 2019
  2. 05/13 t5701: git --version can have SP in itJeremy Huddleston Sequoia, Jan 29, 2019
  3. Johannes SchindelinJan 30, 2019
  4. Jeremy Huddleston SequoiaJan 30, 2019
  5. 08/13 git mergetool/difftool doesn't list 'opendiff' as an available tool on 10.8Jeremy Huddleston Sequoia, Jan 29, 2019
  6. Johannes SchindelinJan 30, 2019
  7. 06/13 Set Apple Git version during buildJeremy Huddleston Sequoia, Jan 29, 2019
  8. Johannes SchindelinJan 30, 2019
  9. Jeremy Huddleston SequoiaJan 30, 2019
  10. 09/13 Use symbolic links rather than hard links for files in libexecJeremy Huddleston Sequoia, Jan 29, 2019
  11. brian m. carlsonJan 30, 2019
  12. Jeremy Huddleston SequoiaJan 30, 2019
  13. Johannes SchindelinJan 30, 2019
  14. Jeremy Huddleston SequoiaJan 30, 2019
  15. 01/13 .gitignore: Remove *.s as it matches *.S on case insensitive filesystemJeremy Huddleston Sequoia, Jan 29, 2019
  16. Eric SunshineJan 30, 2019
  17. Jeremy Huddleston SequoiaJan 30, 2019
  18. Eric SunshineJan 30, 2019
  19. Eric SunshineJan 30, 2019
  20. Johannes SchindelinJan 30, 2019
  21. Jeremy Huddleston SequoiaJan 30, 2019
  22. Junio C HamanoJan 31, 2019
  23. Jeremy SequoiaJan 31, 2019
  24. Eric SunshineJan 31, 2019
  25. Junio C HamanoJan 30, 2019
  26. 04/13 t4014: git --version can have SP in itJeremy Huddleston Sequoia, Jan 29, 2019
  27. Junio C HamanoJan 29, 2019
  28. Johannes SchindelinJan 30, 2019
  29. 10/13 Support for Xcode.app co-exestince and relocationJeremy Huddleston Sequoia, Jan 29, 2019
  30. Johannes SchindelinJan 30, 2019
  31. Jeremy Huddleston SequoiaJan 30, 2019
  32. 07/13 HTML documentation is not provided with Apple's git. Make the error message more on point.Jeremy Huddleston Sequoia, Jan 29, 2019
  33. Junio C HamanoJan 29, 2019
  34. Johannes SchindelinJan 30, 2019
  35. Junio C HamanoJan 30, 2019
  36. Johannes SchindelinJan 30, 2019
  37. 03/13 t0500: New regression test for git add of a path that contains a .git directoryJeremy Huddleston Sequoia, Jan 29, 2019
  38. Eric SunshineJan 30, 2019
  39. Johannes SchindelinJan 30, 2019
  40. Jeremy Huddleston SequoiaJan 30, 2019
  41. 12/13 Enable support for Xcode.app-bundled gitconfigJeremy Huddleston Sequoia, Jan 29, 2019
  42. Junio C HamanoJan 29, 2019
  43. Jeremy Huddleston SequoiaJan 29, 2019
  44. Johannes SchindelinJan 30, 2019
  45. Jeremy Huddleston SequoiaJan 30, 2019
  46. Jeremy Huddleston SequoiaJan 30, 2019
  47. Jonathan NiederJan 31, 2019
  48. Jeremy Huddleston SequoiaJan 31, 2019
  49. Junio C HamanoJan 31, 2019
  50. brian m. carlsonJan 30, 2019
  51. 13/13 Enable support for Xcode.app-bundled gitattributesJeremy Huddleston Sequoia, Jan 29, 2019
  52. 02/13 test-lib: Export PERL5LIB for testing git-svnJeremy Huddleston Sequoia, Jan 29, 2019
  53. Junio C HamanoJan 29, 2019
  54. Jeremy Huddleston SequoiaJan 29, 2019
  55. SZEDER GáborJan 29, 2019
  56. Jeremy SequoiaJan 30, 2019
  57. Junio C HamanoJan 30, 2019
  58. Carlo ArenasJan 30, 2019
  59. Johannes SchindelinJan 30, 2019
  60. Jeremy SequoiaJan 30, 2019
  61. 11/13 Fix problem found from running the test suite.Jeremy Huddleston Sequoia, Jan 29, 2019
  62. Junio C HamanoJan 29, 2019
  63. Eric WongJan 29, 2019

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.