]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/environ-wo-the-repository'
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Sep 2024 17:35:04 +0000 (10:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Sep 2024 17:35:05 +0000 (10:35 -0700)
Code clean-up.

* ps/environ-wo-the-repository: (21 commits)
  environment: stop storing "core.notesRef" globally
  environment: stop storing "core.warnAmbiguousRefs" globally
  environment: stop storing "core.preferSymlinkRefs" globally
  environment: stop storing "core.logAllRefUpdates" globally
  refs: stop modifying global `log_all_ref_updates` variable
  branch: stop modifying `log_all_ref_updates` variable
  repo-settings: track defaults close to `struct repo_settings`
  repo-settings: split out declarations into a standalone header
  environment: guard state depending on a repository
  environment: reorder header to split out `the_repository`-free section
  environment: move `set_git_dir()` and related into setup layer
  environment: make `get_git_namespace()` self-contained
  environment: move object database functions into object layer
  config: make dependency on repo in `read_early_config()` explicit
  config: document `read_early_config()` and `read_very_early_config()`
  environment: make `get_git_work_tree()` accept a repository
  environment: make `get_graft_file()` accept a repository
  environment: make `get_index_file()` accept a repository
  environment: make `get_object_directory()` accept a repository
  environment: make `get_git_common_dir()` accept a repository
  ...

17 files changed:
1  2 
apply.c
builtin/config.c
builtin/gc.c
builtin/pack-objects.c
builtin/repack.c
builtin/stash.c
builtin/submodule--helper.c
bundle-uri.c
commit.c
compat/mingw.c
fetch-pack.c
ref-filter.c
refs/files-backend.c
repository.c
submodule.c
t/helper/test-path-utils.c
wt-status.c

diff --cc apply.c
Simple merge
Simple merge
diff --cc builtin/gc.c
Simple merge
Simple merge
Simple merge
diff --cc builtin/stash.c
Simple merge
Simple merge
diff --cc bundle-uri.c
index dc0c96955b829997fd251e0feff0b088ad461c6b,eb8eca078bb38128dfc78f38aca94ad297434132..4b1a2e293757b9d196fdf5295563b1e7c18acb82
@@@ -13,7 -12,7 +12,8 @@@
  #include "config.h"
  #include "fetch-pack.h"
  #include "remote.h"
 +#include "trace2.h"
+ #include "object-store-ll.h"
  
  static struct {
        enum bundle_list_heuristic heuristic;
diff --cc commit.c
Simple merge
diff --cc compat/mingw.c
Simple merge
diff --cc fetch-pack.c
Simple merge
diff --cc ref-filter.c
Simple merge
Simple merge
diff --cc repository.c
Simple merge
diff --cc submodule.c
Simple merge
Simple merge
diff --cc wt-status.c
Simple merge