]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/config-wo-the-repository'
authorJunio C Hamano <gitster@pobox.com>
Mon, 4 Aug 2025 15:10:32 +0000 (08:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Aug 2025 15:10:33 +0000 (08:10 -0700)
The config API had a set of convenience wrapper functions that
implicitly use the_repository instance; they have been removed and
inlined at the calling sites.

* ps/config-wo-the-repository: (21 commits)
  config: fix sign comparison warnings
  config: move Git config parsing into "environment.c"
  config: remove unused `the_repository` wrappers
  config: drop `git_config_set_multivar()` wrapper
  config: drop `git_config_get_multivar_gently()` wrapper
  config: drop `git_config_set_multivar_in_file_gently()` wrapper
  config: drop `git_config_set_in_file_gently()` wrapper
  config: drop `git_config_set()` wrapper
  config: drop `git_config_set_gently()` wrapper
  config: drop `git_config_set_in_file()` wrapper
  config: drop `git_config_get_bool()` wrapper
  config: drop `git_config_get_ulong()` wrapper
  config: drop `git_config_get_int()` wrapper
  config: drop `git_config_get_string()` wrapper
  config: drop `git_config_get_string()` wrapper
  config: drop `git_config_get_string_multi()` wrapper
  config: drop `git_config_get_value()` wrapper
  config: drop `git_config_get_value()` wrapper
  config: drop `git_config_get()` wrapper
  config: drop `git_config_clear()` wrapper
  ...

24 files changed:
1  2 
builtin/blame.c
builtin/commit.c
builtin/fast-export.c
builtin/fast-import.c
builtin/for-each-ref.c
builtin/gc.c
builtin/log.c
builtin/pack-objects.c
builtin/pull.c
builtin/rebase.c
builtin/reflog.c
builtin/remote.c
builtin/repack.c
builtin/rev-list.c
config.c
config.h
daemon.c
fetch-pack.c
gpg-interface.c
reflog.c
refs.c
refs/packed-backend.c
refs/reftable-backend.c
revision.c

diff --cc builtin/blame.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc builtin/gc.c
Simple merge
diff --cc builtin/log.c
Simple merge
Simple merge
diff --cc builtin/pull.c
Simple merge
Simple merge
Simple merge
index 5dd6cbbaeedb252f0cbf389b15b00cf46449d8ed,4c63a8bb5760da938b7696d0be740df6d42cd487..43a122740af300642f5cc7fb3621f2dbc3a9afdb
@@@ -223,10 -208,8 +223,10 @@@ static int add(int argc, const char **a
        if (!valid_remote_name(name))
                die(_("'%s' is not a valid remote name"), name);
  
 +      for_each_remote(check_remote_collision, (void *)name);
 +
        strbuf_addf(&buf, "remote.%s.url", name);
-       git_config_set(buf.buf, url);
+       repo_config_set(the_repository, buf.buf, url);
  
        if (!mirror || mirror & MIRROR_FETCH) {
                strbuf_reset(&buf);
Simple merge
Simple merge
diff --cc config.c
Simple merge
diff --cc config.h
Simple merge
diff --cc daemon.c
Simple merge
diff --cc fetch-pack.c
Simple merge
diff --cc gpg-interface.c
Simple merge
diff --cc reflog.c
Simple merge
diff --cc refs.c
Simple merge
Simple merge
Simple merge
diff --cc revision.c
Simple merge