From: Tian Yuchen <cat@malon.dev>
To: git@vger.kernel.org
Cc: cirnovskyv@gmail.com, szeder.dev@gmail.com,
Tian Yuchen <cat@malon.dev>,
Christian Couder <christian.couder@gmail.com>,
Ayush Chandekar <ayu.chandekar@gmail.com>,
Olamide Caleb Bello <belkid98@gmail.com>
Subject: [PATCH v9 3/9] environment: move editor_program into repo_config_values
Date: Fri, 10 Jul 2026 00:11:39 +0800 [thread overview]
Message-ID: <20260709161145.13349-4-cat@malon.dev> (raw)
In-Reply-To: <20260709161145.13349-1-cat@malon.dev>
The global variable 'editor_program' holds the path to the user's
preferred editor. Move 'editor_program' into
'struct repo_config_values' to continue the libification effort.
There have been discussions on whether external programs like
editors truly need to be configured on a per-repository basis within
the same process. While a single process might rarely invoke
different editors, this migration is necessary for two reasons:
1. Developers frequently use different toolchains for different
projects. Per-repo configuration respects this.
2. Moving this string into 'repo_config_values' eliminates mutable
global state. As the codebase moves toward becoming a long-running
processes managing multiple repositories concurrently must
not overwrite each other's program configurations.
No standalone getter function is introduced. Callers directly access
the field via 'repo_config_values()'. Heap memory is safely reclaimed
in 'repo_config_values_clear()'.
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>
---
editor.c | 4 ++--
environment.c | 7 ++++---
environment.h | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/editor.c b/editor.c
index fd174e6a03..07d264cba0 100644
--- a/editor.c
+++ b/editor.c
@@ -29,8 +29,8 @@ const char *git_editor(void)
const char *editor = getenv("GIT_EDITOR");
int terminal_is_dumb = is_terminal_dumb();
- if (!editor && editor_program)
- editor = editor_program;
+ if (!editor && repo_config_values(the_repository)->editor_program)
+ editor = repo_config_values(the_repository)->editor_program;
if (!editor && !terminal_is_dumb)
editor = getenv("VISUAL");
if (!editor)
diff --git a/environment.c b/environment.c
index 5950592d63..0a01f4761a 100644
--- a/environment.c
+++ b/environment.c
@@ -55,7 +55,6 @@ int fsync_object_files = -1;
int use_fsync = -1;
enum fsync_method fsync_method = FSYNC_METHOD_DEFAULT;
enum fsync_component fsync_components = FSYNC_COMPONENTS_DEFAULT;
-char *editor_program;
char *askpass_program;
enum auto_crlf auto_crlf = AUTO_CRLF_FALSE;
enum eol core_eol = EOL_UNSET;
@@ -435,8 +434,8 @@ int git_default_core_config(const char *var, const char *value,
}
if (!strcmp(var, "core.editor")) {
- FREE_AND_NULL(editor_program);
- return git_config_string(&editor_program, var, value);
+ FREE_AND_NULL(cfg->editor_program);
+ return git_config_string(&cfg->editor_program, var, value);
}
if (!strcmp(var, "core.commentchar") ||
@@ -723,6 +722,7 @@ void repo_config_values_init(struct repo_config_values *cfg)
{
cfg->attributes_file = NULL;
cfg->excludes_file = NULL;
+ cfg->editor_program = NULL;
cfg->apply_sparse_checkout = 0;
cfg->branch_track = BRANCH_TRACK_REMOTE;
cfg->trust_ctime = 1;
@@ -753,4 +753,5 @@ void repo_config_values_clear(struct repository *repo)
FREE_AND_NULL(cfg->attributes_file);
FREE_AND_NULL(cfg->excludes_file);
+ FREE_AND_NULL(cfg->editor_program);
}
diff --git a/environment.h b/environment.h
index 2e8352de7f..1ec19149cb 100644
--- a/environment.h
+++ b/environment.h
@@ -91,6 +91,7 @@ struct repo_config_values {
/* section "core" config values */
char *attributes_file;
char *excludes_file;
+ char *editor_program;
int apply_sparse_checkout;
int trust_ctime;
int check_stat;
@@ -218,7 +219,6 @@ const char *get_commit_output_encoding(void);
extern char *git_commit_encoding;
extern char *git_log_output_encoding;
-extern char *editor_program;
extern char *askpass_program;
/*
--
2.43.0
next prev parent reply other threads:[~2026-07-09 16:12 UTC|newest]
Thread overview: 113+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-26 7:50 [PATCH v2 0/2] environment: move excludes_file into repo_config_values Tian Yuchen
2026-06-26 7:50 ` [PATCH v2 1/2] dir: encapsulate excludes_file lazy-load Tian Yuchen
2026-06-26 21:14 ` SZEDER Gábor
2026-06-26 21:45 ` Junio C Hamano
2026-06-27 14:13 ` Tian Yuchen
2026-06-26 7:50 ` [PATCH v2 2/2] environment: move excludes_file into repo_config_values Tian Yuchen
2026-06-26 15:43 ` Junio C Hamano
2026-06-26 19:12 ` Junio C Hamano
2026-06-27 14:10 ` Tian Yuchen
2026-06-26 15:42 ` [PATCH v2 0/2] " Junio C Hamano
2026-06-27 13:56 ` Tian Yuchen
2026-06-27 16:08 ` [PATCH v4 0/1] " Tian Yuchen
2026-06-27 16:08 ` [PATCH v4 1/1] " Tian Yuchen
2026-06-27 16:10 ` Tian Yuchen
2026-06-27 20:47 ` Junio C Hamano
2026-06-28 3:19 ` Tian Yuchen
2026-06-28 3:38 ` Tian Yuchen
2026-06-28 8:40 ` Junio C Hamano
2026-06-28 12:58 ` Tian Yuchen
2026-06-29 6:03 ` Christian Couder
2026-06-29 14:47 ` Junio C Hamano
2026-06-30 16:20 ` Tian Yuchen
2026-07-01 18:14 ` Tian Yuchen
2026-06-30 16:44 ` [PATCH v5 0/1] " Tian Yuchen
2026-06-30 16:44 ` [PATCH v5 1/1] " Tian Yuchen
2026-07-01 18:08 ` [PATCH v6 0/1] " Tian Yuchen
2026-07-01 18:08 ` [PATCH v6 1/1] " Tian Yuchen
2026-07-06 14:25 ` [PATCH v7 0/9] migrate more variables " Tian Yuchen
2026-07-06 14:25 ` [PATCH v7 1/9] repository: introduce repo_config_values_clear() Tian Yuchen
2026-07-06 14:25 ` [PATCH v7 2/9] environment: move excludes_file into repo_config_values Tian Yuchen
2026-07-06 14:25 ` [PATCH v7 3/9] environment: move editor_program " Tian Yuchen
2026-07-11 19:05 ` Pablo Sabater
2026-07-11 19:38 ` Pablo Sabater
2026-07-06 14:25 ` [PATCH v7 4/9] environment: move pager_program " Tian Yuchen
2026-07-06 17:38 ` Junio C Hamano
2026-07-06 14:25 ` [PATCH v7 5/9] environment: move askpass_program " Tian Yuchen
2026-07-06 14:25 ` [PATCH v7 6/9] environment: migrate apply_default_whitespace and apply_default_ignorewhitespace Tian Yuchen
2026-07-06 14:25 ` [PATCH v7 7/9] environment: move push_default into repo_config_values Tian Yuchen
2026-07-06 14:25 ` [PATCH v7 8/9] environment: move autorebase " Tian Yuchen
2026-07-06 14:25 ` [PATCH v7 9/9] environment: move object_creation_mode " Tian Yuchen
2026-07-08 16:02 ` [PATCH v8 0/9] migrate more variables " Tian Yuchen
2026-07-08 16:02 ` [PATCH v8 1/9] repository: introduce repo_config_values_clear() Tian Yuchen
2026-07-08 16:02 ` [PATCH v8 2/9] environment: move excludes_file into repo_config_values Tian Yuchen
2026-07-08 16:02 ` [PATCH v8 3/9] environment: move editor_program " Tian Yuchen
2026-07-08 16:02 ` [PATCH v8 4/9] environment: move pager_program " Tian Yuchen
2026-07-09 3:53 ` Junio C Hamano
2026-07-09 16:12 ` Tian Yuchen
2026-07-09 16:41 ` Junio C Hamano
2026-07-08 16:02 ` [PATCH v8 5/9] environment: move askpass_program " Tian Yuchen
2026-07-08 16:02 ` [PATCH v8 6/9] environment: migrate apply_default_whitespace and apply_default_ignorewhitespace Tian Yuchen
2026-07-08 16:02 ` [PATCH v8 7/9] environment: move push_default into repo_config_values Tian Yuchen
2026-07-08 16:02 ` [PATCH v8 8/9] environment: move autorebase " Tian Yuchen
2026-07-08 16:03 ` [PATCH v8 9/9] environment: move object_creation_mode " Tian Yuchen
2026-07-09 16:11 ` [PATCH v9 0/9] migrate more variables " Tian Yuchen
2026-07-09 16:11 ` [PATCH v9 1/9] repository: introduce repo_config_values_clear() Tian Yuchen
2026-07-11 17:21 ` Pablo Sabater
2026-07-11 18:35 ` Tian Yuchen
2026-07-12 9:28 ` Pablo Sabater
2026-07-12 10:44 ` Tian Yuchen
2026-07-09 16:11 ` [PATCH v9 2/9] environment: move excludes_file into repo_config_values Tian Yuchen
2026-07-11 18:21 ` Pablo Sabater
2026-07-12 10:08 ` Tian Yuchen
2026-07-09 16:11 ` Tian Yuchen [this message]
2026-07-11 19:30 ` [PATCH v9 3/9] environment: move editor_program " Pablo Sabater
2026-07-09 16:11 ` [PATCH v9 4/9] environment: move pager_program " Tian Yuchen
2026-07-09 16:11 ` [PATCH v9 5/9] environment: move askpass_program " Tian Yuchen
2026-07-09 16:11 ` [PATCH v9 6/9] environment: migrate apply_default_whitespace and apply_default_ignorewhitespace Tian Yuchen
2026-07-09 16:11 ` [PATCH v9 7/9] environment: move push_default into repo_config_values Tian Yuchen
2026-07-09 16:11 ` [PATCH v9 8/9] environment: move autorebase " Tian Yuchen
2026-07-09 16:11 ` [PATCH v9 9/9] environment: move object_creation_mode " Tian Yuchen
2026-07-11 15:24 ` [PATCH v9 0/9] migrate more variables " Pablo Sabater
2026-07-11 16:11 ` Tian Yuchen
2026-07-11 21:10 ` Junio C Hamano
2026-07-11 21:06 ` Junio C Hamano
2026-07-12 9:34 ` Pablo Sabater
2026-07-12 11:17 ` [PATCH v10 " Tian Yuchen
2026-07-12 11:17 ` [PATCH v10 1/9] repository: introduce repo_config_values_clear() Tian Yuchen
2026-07-12 11:17 ` [PATCH v10 2/9] environment: move excludes_file into repo_config_values Tian Yuchen
2026-07-12 11:17 ` [PATCH v10 3/9] environment: move editor_program " Tian Yuchen
2026-07-12 11:17 ` [PATCH v10 4/9] environment: move pager_program " Tian Yuchen
2026-07-12 14:12 ` Pablo Sabater
2026-07-12 16:54 ` Tian Yuchen
2026-07-12 15:36 ` Junio C Hamano
2026-07-12 16:58 ` Tian Yuchen
2026-07-12 11:17 ` [PATCH v10 5/9] environment: move askpass_program " Tian Yuchen
2026-07-12 14:31 ` Pablo Sabater
2026-07-12 15:47 ` Junio C Hamano
2026-07-12 11:17 ` [PATCH v10 6/9] environment: migrate apply_default_whitespace and apply_default_ignorewhitespace Tian Yuchen
2026-07-12 15:04 ` Pablo Sabater
2026-07-12 11:17 ` [PATCH v10 7/9] environment: move push_default into repo_config_values Tian Yuchen
2026-07-12 15:49 ` Pablo Sabater
2026-07-12 11:17 ` [PATCH v10 8/9] environment: move autorebase " Tian Yuchen
2026-07-12 11:17 ` [PATCH v10 9/9] environment: move object_creation_mode " Tian Yuchen
2026-07-13 3:57 ` [PATCH v11 00/10] migrate more variables " Tian Yuchen
2026-07-13 3:57 ` [PATCH v11 01/10] repository: introduce repo_config_values_clear() Tian Yuchen
2026-07-13 3:57 ` [PATCH v11 02/10] environment: move excludes_file into repo_config_values Tian Yuchen
2026-07-13 3:57 ` [PATCH v11 03/10] environment: move editor_program " Tian Yuchen
2026-07-13 3:57 ` [PATCH v11 04/10] environment: move pager_program " Tian Yuchen
2026-07-13 3:57 ` [PATCH v11 05/10] environment: move askpass_program " Tian Yuchen
2026-07-13 3:57 ` [PATCH v11 06/10] environment: migrate apply_default_whitespace and apply_default_ignorewhitespace Tian Yuchen
2026-07-13 16:39 ` Junio C Hamano
2026-07-14 3:19 ` Tian Yuchen
2026-07-14 3:25 ` [PATCH v12 00/10] migrate more variables into repo_config_values Tian Yuchen
2026-07-14 3:25 ` [PATCH v12 01/10] repository: introduce repo_config_values_clear() Tian Yuchen
2026-07-14 3:25 ` [PATCH v12 02/10] environment: move excludes_file into repo_config_values Tian Yuchen
2026-07-14 3:25 ` [PATCH v12 03/10] environment: move editor_program " Tian Yuchen
2026-07-14 3:25 ` [PATCH v12 04/10] environment: move pager_program " Tian Yuchen
2026-07-14 3:25 ` [PATCH v12 05/10] environment: move askpass_program " Tian Yuchen
2026-07-14 3:25 ` [PATCH v12 06/10] environment: migrate apply_default_whitespace and apply_default_ignorewhitespace Tian Yuchen
2026-07-14 3:25 ` [PATCH v12 07/10] environment: move push_default into repo_config_values Tian Yuchen
2026-07-14 3:25 ` [PATCH v12 08/10] environment: move autorebase " Tian Yuchen
2026-07-14 3:25 ` [PATCH v12 09/10] environment: move object_creation_mode " Tian Yuchen
2026-07-14 3:25 ` [PATCH v12 10/10] repository: adjust the comment of config_values_private_ Tian Yuchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260709161145.13349-4-cat@malon.dev \
--to=cat@malon.dev \
--cc=ayu.chandekar@gmail.com \
--cc=belkid98@gmail.com \
--cc=christian.couder@gmail.com \
--cc=cirnovskyv@gmail.com \
--cc=git@vger.kernel.org \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.