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

[PATCH v7 8/9] environment: move autorebase into repo_config_values

From
Tian Yuchen <cat@malon.dev>
Date
Jul 6, 2026, 14:25 UTC
Message-ID
<20260706142530.3681520-9-cat@malon.dev>
In-Reply-To
<20260706142530.3681520-1-cat@malon.dev>

The global variable 'autorebase' dictates whether a newly created branch should be configured to automatically rebase by default. Move it into 'struct repo_config_values' to continue the libification effort.

The 'enum rebase_setup_type' definition is moved higher up in 'environment.h' so that it is visible to the repository-specific structure. The default state AUTOREBASE_NEVER is now correctly initialized in 'repo_config_values_init()'.

Configuration parsing in 'git_default_branch_config()' is updated to write directly to the repository's configuration instance.

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>
---
 branch.c      |  2 +-
 environment.c | 10 +++++-----
 environment.h | 16 ++++++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/branch.c b/branch.c
index 243db7d0fc..e1c1f8c89d 100644
--- a/branch.c
+++ b/branch.c
@@ -61,7 +61,7 @@ static int find_tracked_branch(struct remote *remote, void *priv)
 
 static int should_setup_rebase(const char *origin)
 {
-	switch (autorebase) {
+	switch (repo_config_values(the_repository)->autorebase) {
 	case AUTOREBASE_NEVER:
 		return 0;
 	case AUTOREBASE_LOCAL:
diff --git a/environment.c b/environment.c
index 09de2fee87..7701aa3bc0 100644
--- a/environment.c
+++ b/environment.c
@@ -58,7 +58,6 @@ enum auto_crlf auto_crlf = AUTO_CRLF_FALSE;
 enum eol core_eol = EOL_UNSET;
 int global_conv_flags_eol = CONV_EOL_RNDTRP_WARN;
 char *check_roundtrip_encoding;
-enum rebase_setup_type autorebase = AUTOREBASE_NEVER;
 #ifndef OBJECT_CREATION_MODE
 #define OBJECT_CREATION_MODE OBJECT_CREATION_USES_HARDLINKS
 #endif
@@ -600,13 +599,13 @@ static int git_default_branch_config(const char *var, const char *value)
 		if (!value)
 			return config_error_nonbool(var);
 		else if (!strcmp(value, "never"))
-			autorebase = AUTOREBASE_NEVER;
+			cfg->autorebase = AUTOREBASE_NEVER;
 		else if (!strcmp(value, "local"))
-			autorebase = AUTOREBASE_LOCAL;
+			cfg->autorebase = AUTOREBASE_LOCAL;
 		else if (!strcmp(value, "remote"))
-			autorebase = AUTOREBASE_REMOTE;
+			cfg->autorebase = AUTOREBASE_REMOTE;
 		else if (!strcmp(value, "always"))
-			autorebase = AUTOREBASE_ALWAYS;
+			cfg->autorebase = AUTOREBASE_ALWAYS;
 		else
 			return error(_("malformed value for %s"), var);
 		return 0;
@@ -727,6 +726,7 @@ void repo_config_values_init(struct repo_config_values *cfg)
 	cfg->apply_default_whitespace = NULL;
 	cfg->apply_default_ignorewhitespace = NULL;
 	cfg->push_default = PUSH_DEFAULT_UNSPECIFIED;
+	cfg->autorebase = AUTOREBASE_NEVER;
 	cfg->apply_sparse_checkout = 0;
 	cfg->branch_track = BRANCH_TRACK_REMOTE;
 	cfg->trust_ctime = 1;
diff --git a/environment.h b/environment.h
index 72859b5d76..464ff73136 100644
--- a/environment.h
+++ b/environment.h
@@ -102,6 +102,13 @@ enum push_default_type {
 	PUSH_DEFAULT_UNSPECIFIED
 };
 
+enum rebase_setup_type {
+	AUTOREBASE_NEVER = 0,
+	AUTOREBASE_LOCAL,
+	AUTOREBASE_REMOTE,
+	AUTOREBASE_ALWAYS
+};
+
 struct repo_config_values {
 	/* section "core" config values */
 	char *attributes_file;
@@ -112,6 +119,7 @@ struct repo_config_values {
 	char *apply_default_whitespace;
 	char *apply_default_ignorewhitespace;
 	enum push_default_type push_default;
+	enum rebase_setup_type autorebase;
 	int apply_sparse_checkout;
 	int trust_ctime;
 	int check_stat;
@@ -205,14 +213,6 @@ extern unsigned long pack_size_limit_cfg;
 extern int protect_hfs;
 extern int protect_ntfs;
 
-enum rebase_setup_type {
-	AUTOREBASE_NEVER = 0,
-	AUTOREBASE_LOCAL,
-	AUTOREBASE_REMOTE,
-	AUTOREBASE_ALWAYS
-};
-extern enum rebase_setup_type autorebase;
-
 enum object_creation_mode {
 	OBJECT_CREATION_USES_HARDLINKS = 0,
 	OBJECT_CREATION_USES_RENAMES = 1
-- 
2.43.0
Previous: Tian YuchenNext: Tian Yuchen
Message 39 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.