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

Re: [PATCH v10 4/9] environment: move pager_program into repo_config_values

From
Pablo Sabater <pabloosabaterr@gmail.com>
Date
Jul 12, 2026, 14:12 UTC
Message-ID
<DJWNK8BOFIAW.3VVAROHMKVDWE@gmail.com>
In-Reply-To
<20260712111734.1073514-5-cat@malon.dev>
On Sun Jul 12, 2026 at 1:17 PM CEST, Tian Yuchen wrote:
Show 81 quoted lines
> The 'pager_program' variable is currently defined as a file-scoped
> static string in pager.c. Move it into 'struct repo_config_values'.
>
> The configuration parsing logic remains strictly within pager.c to
> respect subsystem boundaries. The read/write operations are simply
> redirected to the repository-specific structure using
> 'repo_config_values()'.
>
> Similar to the recent editor_program migration, no standalone getter
> is introduced to keep the code minimal. The dynamically allocated
> memory is now managed by 'repo_config_values_clear()'.
>
> On top of that, fix a memory leak in pager.c while we are at it.
>
> 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>
> ---
>  environment.c |  2 ++
>  environment.h |  1 +
>  pager.c       | 26 +++++++++++++++++---------
>  3 files changed, 20 insertions(+), 9 deletions(-)
>
> diff --git a/environment.c b/environment.c
> index a65d575af4..975c9cb9eb 100644
> --- a/environment.c
> +++ b/environment.c
> @@ -725,6 +725,7 @@ void repo_config_values_init(struct repo_config_values *cfg)
>  	cfg->attributes_file = NULL;
>  	cfg->excludes_file = NULL;
>  	cfg->editor_program = NULL;
> +	cfg->pager_program = NULL;
>  	cfg->apply_sparse_checkout = 0;
>  	cfg->branch_track = BRANCH_TRACK_REMOTE;
>  	cfg->trust_ctime = 1;
> @@ -742,4 +743,5 @@ void repo_config_values_clear(struct repo_config_values *cfg)
>  	FREE_AND_NULL(cfg->attributes_file);
>  	FREE_AND_NULL(cfg->excludes_file);
>  	FREE_AND_NULL(cfg->editor_program);
> +	FREE_AND_NULL(cfg->pager_program);
>  }
> diff --git a/environment.h b/environment.h
> index 8178ebab76..39b6691b47 100644
> --- a/environment.h
> +++ b/environment.h
> @@ -92,6 +92,7 @@ struct repo_config_values {
>  	char *attributes_file;
>  	char *excludes_file;
>  	char *editor_program;
> +	char *pager_program;
>  	int apply_sparse_checkout;
>  	int trust_ctime;
>  	int check_stat;
> diff --git a/pager.c b/pager.c
> index 35b210e048..bc55546670 100644
> --- a/pager.c
> +++ b/pager.c
> @@ -5,6 +5,8 @@
>  #include "run-command.h"
>  #include "sigchain.h"
>  #include "alias.h"
> +#include "repository.h"
> +#include "environment.h"
>
>  int pager_use_color = 1;
>
> @@ -13,7 +15,6 @@ int pager_use_color = 1;
>  #endif
>
>  static struct child_process pager_process;
> -static char *pager_program;
>  static int old_fd1 = -1, old_fd2 = -1;
>
>  /* Is the value coming back from term_columns() just a guess? */
> @@ -75,10 +76,15 @@ static void wait_for_pager_signal(int signo)
>
>  static int core_pager_config(const char *var, const char *value,
>  			     const struct config_context *ctx UNUSED,
> -			     void *data UNUSED)
> +			     void *data)
Could this change behaviour that a caller expects?

(looking at the hunk below) we are now using repo_config_values() which contains the condition 'repo != the_repository'. This means that if there is a caller that sends anything but the_repository, it will BUG() out.

Before this patch it would have worked, it worked because callers were sending the correct repository. Now we enforce it.

If we check the callers we can see that everyone sends the_repository, so this new assert is fine and prevents sending submodules by mistake.

Makes sense.
I think it's worth mentioning that on the commit body/function.
Show 9 quoted lines
>  {
> -	if (!strcmp(var, "core.pager"))
> -		return git_config_string(&pager_program, var, value);
> +	struct repository *r = data;
> +
> +	if (!strcmp(var, "core.pager")) {
> +		FREE_AND_NULL(repo_config_values(r)->pager_program);
> +		return git_config_string(&repo_config_values(r)->pager_program, var, value);
> +	}

Ok. Now that pager_program is not file-scoped we drop the UNUSED and pager_program now lives in the per-repo field. Then we change the address where ->pager_program (which we access through repo_config_values()) points to.

FREE_AND_NULL() is new, before this patch it must have been leaking, good job.

Similar to previous patches, let's change the pattern to only call repo_config_values() once and use the pointer it returns.

Show 15 quoted lines
> +
>  	return 0;
>  }
>
> @@ -91,10 +97,10 @@ const char *git_pager(struct repository *r, int stdout_is_tty)
>
>  	pager = getenv("GIT_PAGER");
>  	if (!pager) {
> -		if (!pager_program)
> +		if (!repo_config_values(r)->pager_program)
>  			read_early_config(r,
> -					  core_pager_config, NULL);
> -		pager = pager_program;
> +					  core_pager_config, r);
> +		pager = repo_config_values(r)->pager_program;
Same as above, let's call repo_config_values() once.
Show 12 quoted lines
>  	}
>  	if (!pager)
>  		pager = getenv("PAGER");
> @@ -302,7 +308,9 @@ int check_pager_config(struct repository *r, const char *cmd)
>
>  	read_early_config(r, pager_command_config, &data);
>
> -	if (data.value)
> -		pager_program = data.value;
> +	if (data.value) {
> +		free(repo_config_values(r)->pager_program);
> +		repo_config_values(r)->pager_program = data.value;

Same pattern. This also frees, but the log says "a" memory leak is fixed in this patch, should we change it to two?

> +	}
>  	return data.want;
>  }

I peeked at later patches of this series and the multiple calls of repo_config_values() pattern keeps appearing. I haven't finished reviewing 5-9. If you reroll before I get to those patches, it may be worth fixing this pattern across the whole series.

Regards, Pablo

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