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

Re: [PATCH v10 6/9] environment: migrate apply_default_whitespace and apply_default_ignorewhitespace

From
Pablo Sabater <pabloosabaterr@gmail.com>
Date
Jul 12, 2026, 15:04 UTC
Message-ID
<DJWOO33P3Y4G.3QMT23XDJFIFV@gmail.com>
In-Reply-To
<20260712111734.1073514-7-cat@malon.dev>
On Sun Jul 12, 2026 at 1:17 PM CEST, Tian Yuchen wrote:
Show 42 quoted lines
> The global variables 'apply_default_whitespace' and
> 'apply_default_ignorewhitespace' are used to store the default
> whitespace configuration for 'git apply'. Move these variables
> into 'struct repo_config_values' to continue the libification
> effort.
>
> Dynamically allocated strings fetched via 'repo_config_get_string()'
> are now tracked per-repository and safely freed in
> 'repo_config_values_clear()'.
>
> As part of this transition, update 'git_apply_config()' to accept a
> 'struct repository *' argument rather than relying on the
> 'the_repository' global.
>
> 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>
> ---
>  apply.c       | 20 ++++++++++++--------
>  environment.c |  6 ++++--
>  environment.h |  4 ++--
>  3 files changed, 18 insertions(+), 12 deletions(-)
>
> diff --git a/apply.c b/apply.c
> index 249248d4f2..66db9b7678 100644
> --- a/apply.c
> +++ b/apply.c
> @@ -47,11 +47,13 @@ struct gitdiff_data {
>  	int p_value;
>  };
>
> -static void git_apply_config(void)
> +static void git_apply_config(struct repository *repo)
>  {
> -	repo_config_get_string(the_repository, "apply.whitespace", &apply_default_whitespace);
> -	repo_config_get_string(the_repository, "apply.ignorewhitespace", &apply_default_ignorewhitespace);
> -	repo_config(the_repository, git_xmerge_config, NULL);
> +	repo_config_get_string(repo, "apply.whitespace",
> +			       &repo_config_values(repo)->apply_default_whitespace);
> +	repo_config_get_string(repo, "apply.ignorewhitespace",
> +			       &repo_config_values(repo)->apply_default_ignorewhitespace);

Same pattern, let's call repo_config_values() once. Also, similar to the previous patches, shouldn't be here a FREE_AND_NULL() before each repo_config_get_string() call?

Show 26 quoted lines
> +	repo_config(repo, git_xmerge_config, NULL);
>  }
>
>  static int parse_whitespace_option(struct apply_state *state, const char *option)
> @@ -126,10 +128,12 @@ int init_apply_state(struct apply_state *state,
>  	strset_init(&state->kept_symlinks);
>  	strbuf_init(&state->root, 0);
>
> -	git_apply_config();
> -	if (apply_default_whitespace && parse_whitespace_option(state, apply_default_whitespace))
> +	git_apply_config(repo);
> +	if (repo_config_values(repo)->apply_default_whitespace &&
> +	    parse_whitespace_option(state, repo_config_values(repo)->apply_default_whitespace))
>  		return -1;
> -	if (apply_default_ignorewhitespace && parse_ignorewhitespace_option(state, apply_default_ignorewhitespace))
> +	if (repo_config_values(repo)->apply_default_ignorewhitespace &&
> +	    parse_ignorewhitespace_option(state, repo_config_values(repo)->apply_default_ignorewhitespace))
>  		return -1;
>  	return 0;
>  }
> @@ -192,7 +196,7 @@ int check_apply_state(struct apply_state *state, int force_apply)
>
>  static void set_default_whitespace_mode(struct apply_state *state)
>  {
> -	if (!state->whitespace_option && !apply_default_whitespace)
> +	if (!state->whitespace_option && !repo_config_values(state->repo)->apply_default_whitespace)

We should extract cfg from repo_config_values() to avoid this overly long line.

Show 54 quoted lines
>  		state->ws_error_action = (state->apply ? warn_on_ws_error : nowarn_ws_error);
>  }
>
> diff --git a/environment.c b/environment.c
> index 1a26c9c6d6..41ba013c86 100644
> --- a/environment.c
> +++ b/environment.c
> @@ -49,8 +49,6 @@ int assume_unchanged;
>  int is_bare_repository_cfg = -1; /* unspecified */
>  char *git_commit_encoding;
>  char *git_log_output_encoding;
> -char *apply_default_whitespace;
> -char *apply_default_ignorewhitespace;
>  int fsync_object_files = -1;
>  int use_fsync = -1;
>  enum fsync_method fsync_method = FSYNC_METHOD_DEFAULT;
> @@ -727,6 +725,8 @@ void repo_config_values_init(struct repo_config_values *cfg)
>  	cfg->editor_program = NULL;
>  	cfg->pager_program = NULL;
>  	cfg->askpass_program = NULL;
> +	cfg->apply_default_whitespace = NULL;
> +	cfg->apply_default_ignorewhitespace = NULL;
>  	cfg->apply_sparse_checkout = 0;
>  	cfg->branch_track = BRANCH_TRACK_REMOTE;
>  	cfg->trust_ctime = 1;
> @@ -746,4 +746,6 @@ void repo_config_values_clear(struct repo_config_values *cfg)
>  	FREE_AND_NULL(cfg->editor_program);
>  	FREE_AND_NULL(cfg->pager_program);
>  	FREE_AND_NULL(cfg->askpass_program);
> +	FREE_AND_NULL(cfg->apply_default_whitespace);
> +	FREE_AND_NULL(cfg->apply_default_ignorewhitespace);
>  }
> diff --git a/environment.h b/environment.h
> index a2e9def89d..553f87adee 100644
> --- a/environment.h
> +++ b/environment.h
> @@ -94,6 +94,8 @@ struct repo_config_values {
>  	char *editor_program;
>  	char *pager_program;
>  	char *askpass_program;
> +	char *apply_default_whitespace;
> +	char *apply_default_ignorewhitespace;
>  	int apply_sparse_checkout;
>  	int trust_ctime;
>  	int check_stat;
> @@ -182,8 +184,6 @@ extern int has_symlinks;
>  extern int minimum_abbrev, default_abbrev;
>  extern int ignore_case;
>  extern int assume_unchanged;
> -extern char *apply_default_whitespace;
> -extern char *apply_default_ignorewhitespace;
>  extern unsigned long pack_size_limit_cfg;
>
>  extern int protect_hfs;
The rest LGTM.

Regards, Pablo

Previous: Tian YuchenNext: Tian Yuchen
Message 89 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.