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

Re: [PATCH v9 2/9] environment: move excludes_file into repo_config_values

From
Tian Yuchen <cat@malon.dev>
Date
Jul 12, 2026, 10:08 UTC
Message-ID
<8fe4f7ec-6eaf-4e11-8e6d-cdb6a9a3c347@malon.dev>
In-Reply-To
<DJVY828NHN8O.22CRAQOF73S6D@gmail.com>
On 7/12/26 02:21, Pablo Sabater wrote:
Show 85 quoted lines
> On Thu Jul 9, 2026 at 6:11 PM CEST, Tian Yuchen wrote:
>> The global variable 'excludes_file' is used to track the path to the
>> global ignore file. If this variable is NULL,
>> 'setup_standard_excludes()'
> 
> Nit: Strange line break here.
> 
>> in 'dir.c' forcefully evaluates and assigns the XDG default path to it.
>>
>> Continue the libification effort by encapsulating this lazy-loading
>> fallback logic into a proper getter and moving the variable into
>> 'struct repo_config_values'.
>>
>> Since 'excludes_file' is a dynamically allocated string, it requires
>> proper heap memory management. It is safely freed using the newly
>> introduced `repo_config_values_clear()` function when the repository
>> is torn down.
>>
>> Mentored-by: Christian Couder <christian.couder@gmail.com>
>> Mentored-by: Ayush Chandekar <ayu.chandekar@gmail.com>
>> Mentored-by: Olamide Caleb Bello <belkid98@gmail.com>
>> Signed-off-by: Tian Yuchen <cat@malon.dev>
>> ---
>>   dir.c         |  4 ++--
>>   environment.c | 15 ++++++++++++---
>>   environment.h |  4 +++-
>>   3 files changed, 17 insertions(+), 6 deletions(-)
>>
>> diff --git a/dir.c b/dir.c
>> index 7a73690fbc..4f87a52b3c 100644
>> --- a/dir.c
>> +++ b/dir.c
>> @@ -3481,11 +3481,11 @@ static GIT_PATH_FUNC(git_path_info_exclude, "info/exclude")
>>
>>   void setup_standard_excludes(struct dir_struct *dir)
>>   {
>> +	const char *excludes_file = repo_excludes_file(the_repository);
>> +
>>   	dir->exclude_per_dir = ".gitignore";
>>
>>   	/* core.excludesfile defaulting to $XDG_CONFIG_HOME/git/ignore */
>> -	if (!excludes_file)
>> -		excludes_file = xdg_config_home("ignore");
>>   	if (excludes_file && !access_or_warn(excludes_file, R_OK, 0))
>>   		add_patterns_from_file_1(dir, excludes_file,
>>   					 dir->untracked ? &dir->internal.ss_excludes_file : NULL);
>> diff --git a/environment.c b/environment.c
>> index 13677484de..5950592d63 100644
>> --- a/environment.c
>> +++ b/environment.c
>> @@ -57,7 +57,6 @@ enum fsync_method fsync_method = FSYNC_METHOD_DEFAULT;
>>   enum fsync_component fsync_components = FSYNC_COMPONENTS_DEFAULT;
>>   char *editor_program;
>>   char *askpass_program;
>> -char *excludes_file;
>>   enum auto_crlf auto_crlf = AUTO_CRLF_FALSE;
>>   enum eol core_eol = EOL_UNSET;
>>   int global_conv_flags_eol = CONV_EOL_RNDTRP_WARN;
>> @@ -134,6 +133,14 @@ int is_bare_repository(void)
>>   	return is_bare_repository_cfg && !repo_get_work_tree(the_repository);
>>   }
>>
>> +const char *repo_excludes_file(struct repository *repo)
>> +{
>> +	if (!repo_config_values(repo)->excludes_file)
>> +		repo_config_values(repo)->excludes_file = xdg_config_home("ignore");
>> +
>> +	return repo_config_values(repo)->excludes_file;
>> +}
> 
> repo_config_values() returns a pointer so there should be no need to
> call the function 3 times.
> 
> We could have the function be called once and use it then:
> 
>    const char *repo_excludes_file(struct repository *repo)
>    {
> 	  struct repo_config_values *cfg = repo_config_values(repo);
> 
> 	  if (!cfg->excludes_file)
> 		  cfg->excludes_file = xdg_config_home("ignore");
> 
> 	  return cfg->excludes_file;
>    }
> 
Makes sense, thanks.
Show 63 quoted lines
>> +
>>   int have_git_dir(void)
>>   {
>>   	return startup_info->have_repository
>> @@ -461,8 +468,8 @@ int git_default_core_config(const char *var, const char *value,
>>   	}
>>
>>   	if (!strcmp(var, "core.excludesfile")) {
>> -		FREE_AND_NULL(excludes_file);
>> -		return git_config_pathname(&excludes_file, var, value);
>> +		FREE_AND_NULL(cfg->excludes_file);
>> +		return git_config_pathname(&cfg->excludes_file, var, value);
>>   	}
>>
>>   	if (!strcmp(var, "core.whitespace")) {
>> @@ -715,6 +722,7 @@ int git_default_config(const char *var, const char *value,
>>   void repo_config_values_init(struct repo_config_values *cfg)
>>   {
>>   	cfg->attributes_file = NULL;
>> +	cfg->excludes_file = NULL;
>>   	cfg->apply_sparse_checkout = 0;
>>   	cfg->branch_track = BRANCH_TRACK_REMOTE;
>>   	cfg->trust_ctime = 1;
>> @@ -744,4 +752,5 @@ void repo_config_values_clear(struct repository *repo)
>>   	cfg = repo_config_values(repo);
>>
>>   	FREE_AND_NULL(cfg->attributes_file);
>> +	FREE_AND_NULL(cfg->excludes_file);
>>   }
>> diff --git a/environment.h b/environment.h
>> index c4a6a45704..2e8352de7f 100644
>> --- a/environment.h
>> +++ b/environment.h
>> @@ -90,6 +90,7 @@ struct repository;
>>   struct repo_config_values {
>>   	/* section "core" config values */
>>   	char *attributes_file;
>> +	char *excludes_file;
>>   	int apply_sparse_checkout;
>>   	int trust_ctime;
>>   	int check_stat;
>> @@ -133,6 +134,8 @@ int git_default_config(const char *, const char *,
>>   int git_default_core_config(const char *var, const char *value,
>>   			    const struct config_context *ctx, void *cb);
>>
>> +const char *repo_excludes_file(struct repository *repo);
>> +
>>   void repo_config_values_init(struct repo_config_values *cfg);
>>
>>   /*
>> @@ -217,7 +220,6 @@ extern char *git_log_output_encoding;
>>
>>   extern char *editor_program;
>>   extern char *askpass_program;
>> -extern char *excludes_file;
>>
>>   /*
>>    * The character that begins a commented line in user-editable file
> 
> The rest looks fine.
> 
> Regards,
> Pablo
Regards, yuchen
Previous: Pablo SabaterNext: Tian Yuchen
Message 62 of 114 in “environment: move excludes_file into repo_config_values”
  1. 0/2 environment: move excludes_file into repo_config_valuesTian Yuchen, Jun 26, 2026
  2. 1/2 dir: encapsulate excludes_file lazy-loadTian Yuchen, Jun 26, 2026
  3. SZEDER GáborJun 26, 2026
  4. Junio C HamanoJun 26, 2026
  5. Tian YuchenJun 27, 2026
  6. 2/2 environment: move excludes_file into repo_config_valuesTian Yuchen, Jun 26, 2026
  7. Junio C HamanoJun 26, 2026
  8. Junio C HamanoJun 26, 2026
  9. Tian YuchenJun 27, 2026
  10. Junio C HamanoJun 26, 2026
  11. Tian YuchenJun 27, 2026
  12. 0/1 environment: move excludes_file into repo_config_valuesTian Yuchen, Jun 27, 2026
  13. 1/1 environment: move excludes_file into repo_config_valuesTian Yuchen, Jun 27, 2026
  14. Tian YuchenJun 27, 2026
  15. Junio C HamanoJun 27, 2026
  16. Tian YuchenJun 28, 2026
  17. Tian YuchenJun 28, 2026
  18. Junio C HamanoJun 28, 2026
  19. Tian YuchenJun 28, 2026
  20. Christian CouderJun 29, 2026
  21. Junio C HamanoJun 29, 2026
  22. Tian YuchenJun 30, 2026
  23. Tian YuchenJul 1, 2026
  24. 0/1 environment: move excludes_file into repo_config_valuesTian Yuchen, Jun 30, 2026
  25. 1/1 environment: move excludes_file into repo_config_valuesTian Yuchen, Jun 30, 2026
  26. 0/1 environment: move excludes_file into repo_config_valuesTian Yuchen, Jul 1, 2026
  27. 1/1 environment: move excludes_file into repo_config_valuesTian Yuchen, Jul 1, 2026
  28. 0/9 migrate more variables into repo_config_valuesTian Yuchen, Jul 6, 2026
  29. 1/9 repository: introduce repo_config_values_clear()Tian Yuchen, Jul 6, 2026
  30. 2/9 environment: move excludes_file into repo_config_valuesTian Yuchen, Jul 6, 2026
  31. 3/9 environment: move editor_program into repo_config_valuesTian Yuchen, Jul 6, 2026
  32. Pablo SabaterJul 11, 2026
  33. Pablo SabaterJul 11, 2026
  34. 4/9 environment: move pager_program into repo_config_valuesTian Yuchen, Jul 6, 2026
  35. Junio C HamanoJul 6, 2026
  36. 5/9 environment: move askpass_program into repo_config_valuesTian Yuchen, Jul 6, 2026
  37. 6/9 environment: migrate apply_default_whitespace and apply_default_ignorewhitespaceTian Yuchen, Jul 6, 2026
  38. 7/9 environment: move push_default into repo_config_valuesTian Yuchen, Jul 6, 2026
  39. 8/9 environment: move autorebase into repo_config_valuesTian Yuchen, Jul 6, 2026
  40. 9/9 environment: move object_creation_mode into repo_config_valuesTian Yuchen, Jul 6, 2026
  41. 0/9 migrate more variables into repo_config_valuesTian Yuchen, Jul 8, 2026
  42. 2/9 environment: move excludes_file into repo_config_valuesTian Yuchen, Jul 8, 2026
  43. 1/9 repository: introduce repo_config_values_clear()Tian Yuchen, Jul 8, 2026
  44. 3/9 environment: move editor_program into repo_config_valuesTian Yuchen, Jul 8, 2026
  45. 4/9 environment: move pager_program into repo_config_valuesTian Yuchen, Jul 8, 2026
  46. Junio C HamanoJul 9, 2026
  47. Tian YuchenJul 9, 2026
  48. Junio C HamanoJul 9, 2026
  49. 5/9 environment: move askpass_program into repo_config_valuesTian Yuchen, Jul 8, 2026
  50. 6/9 environment: migrate apply_default_whitespace and apply_default_ignorewhitespaceTian Yuchen, Jul 8, 2026
  51. 7/9 environment: move push_default into repo_config_valuesTian Yuchen, Jul 8, 2026
  52. 8/9 environment: move autorebase into repo_config_valuesTian Yuchen, Jul 8, 2026
  53. 9/9 environment: move object_creation_mode into repo_config_valuesTian Yuchen, Jul 8, 2026
  54. 0/9 migrate more variables into repo_config_valuesTian Yuchen, Jul 9, 2026
  55. 1/9 repository: introduce repo_config_values_clear()Tian Yuchen, Jul 9, 2026
  56. Pablo SabaterJul 11, 2026
  57. Tian YuchenJul 11, 2026
  58. Pablo SabaterJul 12, 2026
  59. Tian YuchenJul 12, 2026
  60. 2/9 environment: move excludes_file into repo_config_valuesTian Yuchen, Jul 9, 2026
  61. Pablo SabaterJul 11, 2026
  62. Tian YuchenJul 12, 2026
  63. 3/9 environment: move editor_program into repo_config_valuesTian Yuchen, Jul 9, 2026
  64. Pablo SabaterJul 11, 2026
  65. 4/9 environment: move pager_program into repo_config_valuesTian Yuchen, Jul 9, 2026
  66. 5/9 environment: move askpass_program into repo_config_valuesTian Yuchen, Jul 9, 2026
  67. 6/9 environment: migrate apply_default_whitespace and apply_default_ignorewhitespaceTian Yuchen, Jul 9, 2026
  68. 7/9 environment: move push_default into repo_config_valuesTian Yuchen, Jul 9, 2026
  69. 8/9 environment: move autorebase into repo_config_valuesTian Yuchen, Jul 9, 2026
  70. 9/9 environment: move object_creation_mode into repo_config_valuesTian Yuchen, Jul 9, 2026
  71. Pablo SabaterJul 11, 2026
  72. Tian YuchenJul 11, 2026
  73. Junio C HamanoJul 11, 2026
  74. Junio C HamanoJul 11, 2026
  75. Pablo SabaterJul 12, 2026
  76. 0/9 migrate more variables into repo_config_valuesTian Yuchen, Jul 12, 2026
  77. 1/9 repository: introduce repo_config_values_clear()Tian Yuchen, Jul 12, 2026
  78. 3/9 environment: move editor_program into repo_config_valuesTian Yuchen, Jul 12, 2026
  79. 2/9 environment: move excludes_file into repo_config_valuesTian Yuchen, Jul 12, 2026
  80. 4/9 environment: move pager_program into repo_config_valuesTian Yuchen, Jul 12, 2026
  81. Pablo SabaterJul 12, 2026
  82. Tian YuchenJul 12, 2026
  83. Junio C HamanoJul 12, 2026
  84. Tian YuchenJul 12, 2026
  85. 5/9 environment: move askpass_program into repo_config_valuesTian Yuchen, Jul 12, 2026
  86. Pablo SabaterJul 12, 2026
  87. Junio C HamanoJul 12, 2026
  88. 6/9 environment: migrate apply_default_whitespace and apply_default_ignorewhitespaceTian Yuchen, Jul 12, 2026
  89. Pablo SabaterJul 12, 2026
  90. 7/9 environment: move push_default into repo_config_valuesTian Yuchen, Jul 12, 2026
  91. Pablo SabaterJul 12, 2026
  92. 8/9 environment: move autorebase into repo_config_valuesTian Yuchen, Jul 12, 2026
  93. 9/9 environment: move object_creation_mode into repo_config_valuesTian Yuchen, Jul 12, 2026
  94. 00/10 migrate more variables into repo_config_valuesTian Yuchen, Jul 13, 2026
  95. 01/10 repository: introduce repo_config_values_clear()Tian Yuchen, Jul 13, 2026
  96. 02/10 environment: move excludes_file into repo_config_valuesTian Yuchen, Jul 13, 2026
  97. 03/10 environment: move editor_program into repo_config_valuesTian Yuchen, Jul 13, 2026
  98. 04/10 environment: move pager_program into repo_config_valuesTian Yuchen, Jul 13, 2026
  99. 05/10 environment: move askpass_program into repo_config_valuesTian Yuchen, Jul 13, 2026
  100. 06/10 environment: migrate apply_default_whitespace and apply_default_ignorewhitespaceTian Yuchen, Jul 13, 2026
  101. Junio C HamanoJul 13, 2026
  102. Tian YuchenJul 14, 2026
  103. Junio C HamanoJul 14, 2026
  104. 00/10 migrate more variables into repo_config_valuesTian Yuchen, Jul 14, 2026
  105. 01/10 repository: introduce repo_config_values_clear()Tian Yuchen, Jul 14, 2026
  106. 02/10 environment: move excludes_file into repo_config_valuesTian Yuchen, Jul 14, 2026
  107. 03/10 environment: move editor_program into repo_config_valuesTian Yuchen, Jul 14, 2026
  108. 04/10 environment: move pager_program into repo_config_valuesTian Yuchen, Jul 14, 2026
  109. 05/10 environment: move askpass_program into repo_config_valuesTian Yuchen, Jul 14, 2026
  110. 06/10 environment: migrate apply_default_whitespace and apply_default_ignorewhitespaceTian Yuchen, Jul 14, 2026
  111. 07/10 environment: move push_default into repo_config_valuesTian Yuchen, Jul 14, 2026
  112. 08/10 environment: move autorebase into repo_config_valuesTian Yuchen, Jul 14, 2026
  113. 09/10 environment: move object_creation_mode into repo_config_valuesTian Yuchen, Jul 14, 2026
  114. 10/10 repository: adjust the comment of config_values_private_Tian Yuchen, Jul 14, 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.