environment: move "branch.autoSetupMerge" into repo-settings

The `branch.autoSetupMerge` repo config is used to detect the tracking
mode for the branch against its upstream for a repository.
This setting is stored in the global variable `git_branch_track`.

Move the setting into the `struct repo-settings` to reduce global
dependency to align with the goal of libyfing Git.

This change requires us to move the enum to "repo-settings.h", or
otherwise we get compilation errors due to include cycles.

Mentored-by: Christain Couder <christian.couder@gmail.com>
Mentored-by: Usman Akinyemi <usmanakinyemi202@gmail.com>
Signed-off-by: Olamide Caleb Bello <belkid98@gmail.com>

Author: cloobTech

branch.h

@@ -1,21 +1,11 @@
 #ifndef BRANCH_H
 #define BRANCH_H
 
+#include "repo-settings.h"
+
 struct repository;
 struct strbuf;
 
-enum branch_track {
-	BRANCH_TRACK_UNSPECIFIED = -1,
-	BRANCH_TRACK_NEVER = 0,
-	BRANCH_TRACK_REMOTE,
-	BRANCH_TRACK_ALWAYS,
-	BRANCH_TRACK_EXPLICIT,
-	BRANCH_TRACK_OVERRIDE,
-	BRANCH_TRACK_INHERIT,
-	BRANCH_TRACK_SIMPLE,
-};
-
-extern enum branch_track git_branch_track;
 
 /* Functions for acting on the information about branches. */
 

builtin/branch.c

@@ -795,7 +795,7 @@ int cmd_branch(int argc,
 	if (!sorting_options.nr)
 		string_list_append(&sorting_options, "refname");
 
-	track = git_branch_track;
+	track = repo_settings_get_branch_track(the_repository);
 
 	head = refs_resolve_refdup(get_main_ref_store(the_repository), "HEAD",
 				   0, &head_oid, NULL);

builtin/checkout.c

@@ -1631,7 +1631,7 @@ static int checkout_branch(struct checkout_opts *opts,
 		if (opts->track != BRANCH_TRACK_UNSPECIFIED)
 			die(_("'%s' cannot be used with '%s'"), "--detach", "-t");
 	} else if (opts->track == BRANCH_TRACK_UNSPECIFIED)
-		opts->track = git_branch_track;
+		opts->track = repo_settings_get_branch_track(the_repository);
 
 	if (new_branch_info->name && !new_branch_info->commit)
 		die(_("Cannot switch branch to a non-commit '%s'"),

builtin/push.c

@@ -162,7 +162,7 @@ static NORETURN void die_push_simple(struct branch *branch,
 		advice_pushdefault_maybe = _("\n"
 				 "To choose either option permanently, "
 				 "see push.default in 'git help config'.\n");
-	if (git_branch_track != BRANCH_TRACK_SIMPLE)
+	if (repo_settings_get_branch_track(the_repository) != BRANCH_TRACK_SIMPLE)
 		advice_automergesimple_maybe = _("\n"
 				 "To avoid automatically configuring "
 				 "an upstream branch when its name\n"

builtin/submodule--helper.c

@@ -3128,7 +3128,7 @@ static int module_create_branch(int argc, const char **argv, const char *prefix,
 	};
 
 	repo_config(the_repository, git_default_config, NULL);
-	track = git_branch_track;
+	track = repo_settings_get_branch_track(the_repository);
 	argc = parse_options(argc, argv, prefix, options, usage, 0);
 
 	if (argc != 3)

environment.c

@@ -607,20 +607,6 @@ static int git_default_i18n_config(const char *var, const char *value)
 
 static int git_default_branch_config(const char *var, const char *value)
 {
-	if (!strcmp(var, "branch.autosetupmerge")) {
-		if (value && !strcmp(value, "always")) {
-			git_branch_track = BRANCH_TRACK_ALWAYS;
-			return 0;
-		} else if (value && !strcmp(value, "inherit")) {
-			git_branch_track = BRANCH_TRACK_INHERIT;
-			return 0;
-		} else if (value && !strcmp(value, "simple")) {
-			git_branch_track = BRANCH_TRACK_SIMPLE;
-			return 0;
-		}
-		git_branch_track = git_config_bool(var, value);
-		return 0;
-	}
 	if (!strcmp(var, "branch.autosetuprebase")) {
 		if (!value)
 			return config_error_nonbool(var);

repo-settings.c

@@ -230,3 +230,18 @@ void repo_settings_reset_shared_repository(struct repository *repo)
 {
 	repo->settings.shared_repository_initialized = 0;
 }
+enum branch_track repo_settings_get_branch_track(struct repository *repo)
+{
+	const char *value;
+	if (!repo_config_get_string_tmp(repo, "branch.autosetupmerge", &value)) {
+		if (value && !strcmp(value, "always"))
+			return BRANCH_TRACK_ALWAYS;
+		else if (value && !strcmp(value, "inherit"))
+			return BRANCH_TRACK_INHERIT;
+		else if (value && !strcmp(value, "simple"))
+			return BRANCH_TRACK_SIMPLE;
+		else
+			return git_config_bool("branch.autosetupmerge", value);
+	}
+	return BRANCH_TRACK_UNSPECIFIED;
+}

repo-settings.h

@@ -23,6 +23,17 @@ enum log_refs_config {
 	LOG_REFS_ALWAYS
 };
 
+enum branch_track {
+	BRANCH_TRACK_UNSPECIFIED = -1,
+	BRANCH_TRACK_NEVER = 0,
+	BRANCH_TRACK_REMOTE,
+	BRANCH_TRACK_ALWAYS,
+	BRANCH_TRACK_EXPLICIT,
+	BRANCH_TRACK_OVERRIDE,
+	BRANCH_TRACK_INHERIT,
+	BRANCH_TRACK_SIMPLE,
+};
+
 struct repo_settings {
 	int initialized;
 
@@ -58,7 +69,7 @@ struct repo_settings {
 	int pack_use_sparse;
 	int pack_use_path_walk;
 	enum fetch_negotiation_setting fetch_negotiation_algorithm;
-
+	enum branch_track git_branch_track;
 	int core_multi_pack_index;
 	int warn_ambiguous_refs; /* lazily loaded via accessor */
 
@@ -99,4 +110,7 @@ int repo_settings_get_shared_repository(struct repository *repo);
 void repo_settings_set_shared_repository(struct repository *repo, int value);
 void repo_settings_reset_shared_repository(struct repository *repo);
 
+/*Read the value for "branch.autosetupmerge"*/
+enum branch_track repo_settings_get_branch_track(struct repository *repo);
+
 #endif /* REPO_SETTINGS_H */