From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 23 Aug 2024 16:02:34 +0000 (-0700)
Subject: Merge branch 'ps/config-wo-the-repository'
X-Git-Tag: v2.47.0-rc0~103
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e56a39e6a9b8621e62f7a18ed027777a095dba7;p=thirdparty%2Fgit.git

Merge branch 'ps/config-wo-the-repository'

Use of API functions that implicitly depend on the_repository
object in the config subsystem has been rewritten to pass a
repository object through the callchain.

* ps/config-wo-the-repository:
  config: hide functions using `the_repository` by default
  global: prepare for hiding away repo-less config functions
  config: don't depend on `the_repository` with branch conditions
  config: don't have setters depend on `the_repository`
  config: pass repo to functions that rename or copy sections
  config: pass repo to `git_die_config()`
  config: pass repo to `git_config_get_expiry_in_days()`
  config: pass repo to `git_config_get_expiry()`
  config: pass repo to `git_config_get_max_percent_split_change()`
  config: pass repo to `git_config_get_split_index()`
  config: pass repo to `git_config_get_index_threads()`
  config: expose `repo_config_clear()`
  config: introduce missing setters that take repo as parameter
  path: hide functions using `the_repository` by default
  path: stop relying on `the_repository` in `worktree_git_path()`
  path: stop relying on `the_repository` when reporting garbage
  hooks: remove implicit dependency on `the_repository`
  editor: do not rely on `the_repository` for interactive edits
  path: expose `do_git_common_path()` as `repo_common_pathv()`
  path: expose `do_git_path()` as `repo_git_pathv()`
---

5e56a39e6a9b8621e62f7a18ed027777a095dba7
diff --cc builtin/remote.c
index 874f14a823,fef3026ef4..d1f9292ed2
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@@ -960,10 -944,8 +960,10 @@@ static int rm(int argc, const char **ar
  
  	if (!result) {
  		strbuf_addf(&buf, "remote.%s", remote->name);
- 		if (git_config_rename_section(buf.buf, NULL) < 1) {
 -		if (repo_config_rename_section(the_repository, buf.buf, NULL) < 1)
 -			return error(_("Could not remove config section '%s'"), buf.buf);
++		if (repo_config_rename_section(the_repository, buf.buf, NULL) < 1) {
 +			result = error(_("Could not remove config section '%s'"), buf.buf);
 +			goto out;
 +		}
  
  		handle_push_default(remote->name, NULL);
  	}