Merge branch 'en/header-split-cleanup'

Split key function and data structure definitions out of cache.h to
new header files and adjust the users.

* en/header-split-cleanup:
  csum-file.h: remove unnecessary inclusion of cache.h
  write-or-die.h: move declarations for write-or-die.c functions from cache.h
  treewide: remove cache.h inclusion due to setup.h changes
  setup.h: move declarations for setup.c functions from cache.h
  treewide: remove cache.h inclusion due to environment.h changes
  environment.h: move declarations for environment.c functions from cache.h
  treewide: remove unnecessary includes of cache.h
  wrapper.h: move declarations for wrapper.c functions from cache.h
  path.h: move function declarations for path.c functions from cache.h
  cache.h: remove expand_user_path()
  abspath.h: move absolute path functions from cache.h
  environment: move comment_line_char from cache.h
  treewide: remove unnecessary cache.h inclusion from several sources
  treewide: remove unnecessary inclusion of gettext.h
  treewide: be explicit about dependence on gettext.h
  treewide: remove unnecessary cache.h inclusion from a few headers

diff --cc add-interactive.c
Simple merge

diff --cc add-patch.c
Simple merge

diff --cc apply.c
Simple merge

diff --cc archive.c
Simple merge

diff --cc bisect.c
Simple merge

diff --cc blame.c
Simple merge

diff --cc branch.c
Simple merge

diff --cc builtin/am.c
Simple merge

diff --cc builtin/bisect.c
Simple merge

diff --cc builtin/blame.c
Simple merge

diff --cc builtin/branch.c
Simple merge

diff --cc builtin/cat-file.c
Simple merge

diff --cc builtin/check-ref-format.c
Simple merge

diff --cc builtin/checkout.c
Simple merge

diff --cc builtin/clone.c
Simple merge

diff --cc builtin/commit-tree.c
Simple merge

diff --cc builtin/commit.c
Simple merge

diff --cc builtin/describe.c
Simple merge

diff --cc builtin/diff.c
Simple merge

diff --cc builtin/difftool.c
Simple merge

diff --cc builtin/fast-export.c
Simple merge

diff --cc builtin/fast-import.c
Simple merge

diff --cc builtin/fetch-pack.c
Simple merge

diff --cc builtin/fetch.c
Simple merge

diff --cc builtin/for-each-ref.c
Simple merge

diff --cc builtin/for-each-repo.c
Simple merge

diff --cc builtin/fsck.c
Simple merge

diff --cc builtin/fsmonitor--daemon.c
Simple merge

diff --cc builtin/gc.c
Simple merge

diff --cc builtin/get-tar-commit-id.c
Simple merge

diff --cc builtin/grep.c
Simple merge

diff --cc builtin/index-pack.c
Simple merge

diff --cc builtin/log.c
Simple merge

diff --cc builtin/ls-files.c
Simple merge

diff --cc builtin/ls-remote.c
Simple merge

diff --cc builtin/ls-tree.c
Simple merge

diff --cc builtin/mailsplit.c
Simple merge

diff --cc builtin/merge-base.c
Simple merge

diff --cc builtin/merge-recursive.c
Simple merge

diff --cc builtin/merge-tree.c
Simple merge

diff --cc builtin/merge.c
Simple merge

diff --cc builtin/mktag.c
Simple merge

diff --cc builtin/name-rev.c
Simple merge

diff --cc builtin/notes.c
Simple merge

diff --cc builtin/pack-objects.c
index bfaef005567f6634fdfc0d1e7ac7597092b504ff,9829b952c2bf033a0a27df3f8501faf2bd19ab5d..77d88f85b04c6d8febb6ed3c79d817e68a991ac2
--- 1/builtin/pack-objects.c
--- 2/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@@ -39,7 -41,7 +41,8 @@@
  #include "shallow.h"
  #include "promisor-remote.h"
  #include "pack-mtimes.h"
 +#include "parse-options.h"
+ #include "wrapper.h"
  
  /*
   * Objects we are going to pack are collected in the `to_pack` structure.

diff --cc builtin/pack-redundant.c
Simple merge

diff --cc builtin/prune.c
Simple merge

diff --cc builtin/pull.c
Simple merge

diff --cc builtin/range-diff.c
Simple merge

diff --cc builtin/read-tree.c
Simple merge

diff --cc builtin/rebase.c
Simple merge

diff --cc builtin/receive-pack.c
index 5123c56f9d5618b046d6c31f3a4f69ba2c3ae70e,3745c0b95cdf65ca0f4a4b9dc23248eb81ee61d0..9109552533d838755a0db62b8de9bd8a671cad12
--- 1/builtin/receive-pack.c
--- 2/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@@ -31,7 -34,7 +34,8 @@@
  #include "commit-reach.h"
  #include "worktree.h"
  #include "shallow.h"
 +#include "parse-options.h"
+ #include "wrapper.h"
  
  static const char * const receive_pack_usage[] = {
        N_("git receive-pack <git-dir>"),

diff --cc builtin/reflog.c
Simple merge

diff --cc builtin/remote.c
Simple merge

diff --cc builtin/repack.c
Simple merge

diff --cc builtin/replace.c
Simple merge

diff --cc builtin/reset.c
Simple merge

diff --cc builtin/rev-list.c
Simple merge

diff --cc builtin/rev-parse.c
Simple merge

diff --cc builtin/revert.c
Simple merge

diff --cc builtin/rm.c
Simple merge

diff --cc builtin/send-pack.c
index 640125fe955de2deff642b2d40a29a69263ff27b,2b360fee426faf0ed9eeb0dd1cb5d3f3b707cbd0..4784143004df1875cba4529e510679c7d058f921
--- 1/builtin/send-pack.c
--- 2/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@@ -16,7 -16,7 +16,8 @@@
  #include "gpg-interface.h"
  #include "gettext.h"
  #include "protocol.h"
 +#include "parse-options.h"
+ #include "write-or-die.h"
  
  static const char * const send_pack_usage[] = {
        N_("git send-pack [--mirror] [--dry-run] [--force]\n"

diff --cc builtin/shortlog.c
Simple merge

diff --cc builtin/show-branch.c
Simple merge

diff --cc builtin/show-ref.c
Simple merge

diff --cc builtin/sparse-checkout.c
Simple merge

diff --cc builtin/stash.c
Simple merge

diff --cc builtin/submodule--helper.c
Simple merge

diff --cc builtin/tag.c
Simple merge

diff --cc builtin/unpack-file.c
Simple merge

diff --cc builtin/unpack-objects.c
Simple merge

diff --cc builtin/update-ref.c
Simple merge

diff --cc builtin/verify-commit.c
Simple merge

diff --cc builtin/verify-tag.c
Simple merge

diff --cc builtin/worktree.c
Simple merge

diff --cc bulk-checkin.c
Simple merge

diff --cc bundle.c
Simple merge

diff --cc cache-tree.c
Simple merge

diff --cc cache.h
index 0ede88565627a8f721e6adda9b622bdb12e27e81,c43051d7928e823588bf033c69704d24d31c3d48..82d7b112b4e71cc2d707f637178841a327217584
--- 1/cache.h
--- 2/cache.h
+++ b/cache.h
@@@ -1103,30 -710,10 +710,8 @@@ extern int quote_path_fully
   * reentrant, as it calls into other non-reentrant git code.
   */
  const char *repo_find_unique_abbrev(struct repository *r, const struct object_id *oid, int len);
 -#define find_unique_abbrev(oid, len) repo_find_unique_abbrev(the_repository, oid, len)
  int repo_find_unique_abbrev_r(struct repository *r, char *hex, const struct object_id *oid, int len);
 -#define find_unique_abbrev_r(hex, oid, len) repo_find_unique_abbrev_r(the_repository, hex, oid, len)
  
- /* set default permissions by passing mode arguments to open(2) */
- int git_mkstemps_mode(char *pattern, int suffix_len, int mode);
- int git_mkstemp_mode(char *pattern, int mode);
- 
- /*
-  * NOTE NOTE NOTE!!
-  *
-  * PERM_UMASK, OLD_PERM_GROUP and OLD_PERM_EVERYBODY enumerations must
-  * not be changed. Old repositories have core.sharedrepository written in
-  * numeric format, and therefore these values are preserved for compatibility
-  * reasons.
-  */
- enum sharedrepo {
-       PERM_UMASK          = 0,
-       OLD_PERM_GROUP      = 1,
-       OLD_PERM_EVERYBODY  = 2,
-       PERM_GROUP          = 0660,
-       PERM_EVERYBODY      = 0664
- };
- int git_config_perm(const char *var, const char *value);
- int adjust_shared_perm(const char *path);
- 
  /*
   * Create the directory containing the named path, using care to be
   * somewhat safe against races. Return one of the scld_error values to
@@@ -1377,9 -911,9 +900,7 @@@ int repo_interpret_branch_name(struct r
                               const char *str, int len,
                               struct strbuf *buf,
                               const struct interpret_branch_name_options *options);
 -#define interpret_branch_name(str, len, buf, options) \
 -      repo_interpret_branch_name(the_repository, str, len, buf, options)
  
- int validate_headref(const char *ref);
- 
  int base_name_compare(const char *name1, size_t len1, int mode1,
                      const char *name2, size_t len2, int mode2);
  int df_name_compare(const char *name1, size_t len1, int mode1,

diff --cc combine-diff.c
Simple merge

diff --cc commit-graph.c
Simple merge

diff --cc commit.c
Simple merge

diff --cc config.c
Simple merge

diff --cc connect.c
Simple merge

diff --cc connected.c
Simple merge

diff --cc delta-islands.c
Simple merge

diff --cc diagnose.c
index 998f517c48869836c4c634ef9f0c129cbe2d274a,f9a2496c7ff07db8367a0b6db1e5e0496403c253..f1aebf0b507fcdeeb311d2b8e2a42e6926fc10a3
--- 1/diagnose.c
--- 2/diagnose.c
+++ b/diagnose.c
@@@ -8,7 -9,7 +9,8 @@@
  #include "strvec.h"
  #include "object-store.h"
  #include "packfile.h"
 +#include "parse-options.h"
+ #include "write-or-die.h"
  
  struct archive_dir {
        const char *path;

diff --cc diff-lib.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc dir.c
Simple merge

diff --cc entry.c
Simple merge

diff --cc fetch-pack.c
Simple merge

diff --cc fmt-merge-msg.c
Simple merge

diff --cc fsck.c
Simple merge

diff --cc grep.c
Simple merge

diff --cc http-push.c
Simple merge

diff --cc list-objects-filter-options.h
index 727c986122fc710b72bc827f1a18cb05b2fb0622,65c6119e9d3d32ba56d95edbdfa502ac250d162a..f6206125868eb06cc448182418c23b3e4c9e95a6
--- 1/list-objects-filter-options.h
--- 2/list-objects-filter-options.h
+++ b/list-objects-filter-options.h
@@@ -1,7 -1,9 +1,8 @@@
  #ifndef LIST_OBJECTS_FILTER_OPTIONS_H
  #define LIST_OBJECTS_FILTER_OPTIONS_H
  
+ #include "gettext.h"
  #include "object.h"
 -#include "parse-options.h"
  #include "string-list.h"
  #include "strbuf.h"
  

diff --cc list-objects.c
Simple merge

diff --cc log-tree.c
Simple merge

diff --cc mailmap.c
index a302335129091087a1bc7479332ab6eeab2cafaa,c24a16eaf4881317a921f3716f539d6276fb6082..74fd9db448fd6c6523eea2e29f8aacae05f17709
--- 1/mailmap.c
--- 2/mailmap.c
+++ b/mailmap.c
@@@ -2,7 -3,18 +3,8 @@@
  #include "string-list.h"
  #include "mailmap.h"
  #include "object-store.h"
+ #include "setup.h"
  
 -#define DEBUG_MAILMAP 0
 -#if DEBUG_MAILMAP
 -#define debug_mm(...) fprintf(stderr, __VA_ARGS__)
 -#define debug_str(X) ((X) ? (X) : "(none)")
 -#else
 -__attribute__((format (printf, 1, 2)))
 -static inline void debug_mm(const char *format, ...) {}
 -static inline const char *debug_str(const char *s) { return s; }
 -#endif
 -
  const char *git_mailmap_file;
  const char *git_mailmap_blob;
  

diff --cc merge-ort.c
Simple merge

diff --cc merge-recursive.c
Simple merge

diff --cc negotiator/default.c
Simple merge

diff --cc negotiator/skipping.c
Simple merge

diff --cc notes-cache.c
Simple merge

diff --cc notes-merge.c
Simple merge

diff --cc notes-utils.c
Simple merge

diff --cc notes.c
Simple merge

diff --cc object-file.c
Simple merge

diff --cc object-name.c
Simple merge

diff --cc pack-bitmap-write.c
Simple merge

diff --cc pack-bitmap.c
Simple merge

diff --cc packfile.c
Simple merge

diff --cc packfile.h
Simple merge

diff --cc parse-options-cb.c
Simple merge

diff --cc parse-options.h
Simple merge

diff --cc pretty.c
Simple merge

diff --cc range-diff.c
Simple merge

diff --cc read-cache.c
Simple merge

diff --cc rebase-interactive.c
Simple merge

diff --cc ref-filter.c
Simple merge

diff --cc ref-filter.h
Simple merge

diff --cc reflog.c
Simple merge

diff --cc refs.c
Simple merge

diff --cc refs.h
Simple merge

diff --cc remote-curl.c
Simple merge

diff --cc remote.c
Simple merge

diff --cc rerere.c
Simple merge

diff --cc rerere.h
Simple merge

diff --cc reset.c
Simple merge

diff --cc revision.c
Simple merge

diff --cc scalar.c
Simple merge

diff --cc send-pack.c
index a3c10898dbd54b15df06c5c64950401b46e349d6,11f41a8d81e541efa956ba1e114eae0a37284742..f81bbb28d79259f25db58548ca3d51fb8b2f6a2d
--- 1/send-pack.c
--- 2/send-pack.c
+++ b/send-pack.c
@@@ -15,9 -16,9 +16,10 @@@
  #include "version.h"
  #include "oid-array.h"
  #include "gpg-interface.h"
- #include "cache.h"
  #include "shallow.h"
 +#include "parse-options.h"
+ #include "trace2.h"
+ #include "write-or-die.h"
  
  int option_parse_push_signed(const struct option *opt,
                             const char *arg, int unset)

diff --cc sequencer.c
Simple merge

diff --cc shallow.c
Simple merge

diff --cc submodule-config.c
Simple merge

diff --cc submodule.c
Simple merge

diff --cc t/helper/test-config.c
Simple merge

diff --cc t/helper/test-dump-cache-tree.c
Simple merge

diff --cc t/helper/test-dump-fsmonitor.c
index 3d2fb92ade89c59b4bc1775b84f12014ef2e8a8a,7e9de296db362ebec94e6642894444d75698ec38..7c6f50158bb09462ca94ba37c8c01960e5924af8
--- 1/t/helper/test-dump-fsmonitor.c
--- 2/t/helper/test-dump-fsmonitor.c
+++ b/t/helper/test-dump-fsmonitor.c
@@@ -1,7 -1,8 +1,8 @@@
  #include "test-tool.h"
  #include "cache.h"
+ #include "setup.h"
  
 -int cmd__dump_fsmonitor(int ac, const char **av)
 +int cmd__dump_fsmonitor(int ac UNUSED, const char **av UNUSED)
  {
        struct index_state *istate = the_repository->index;
        int i;

diff --cc t/helper/test-dump-split-index.c
Simple merge

diff --cc t/helper/test-dump-untracked-cache.c
Simple merge

diff --cc t/helper/test-fast-rebase.c
Simple merge

diff --cc t/helper/test-fsmonitor-client.c
index 0a1e492e5bcfc163242600a5c196f69d65973692,a37236cd0a678d544c9bcb41dfbbe4ced2924313..14522b4c47469c642d75846be1d7c7db794302ab
--- 1/t/helper/test-fsmonitor-client.c
--- 2/t/helper/test-fsmonitor-client.c
+++ b/t/helper/test-fsmonitor-client.c
@@@ -7,11 -7,13 +7,13 @@@
  #include "cache.h"
  #include "parse-options.h"
  #include "fsmonitor-ipc.h"
+ #include "setup.h"
  #include "thread-utils.h"
  #include "trace2.h"
+ #include "wrapper.h"
  
  #ifndef HAVE_FSMONITOR_DAEMON_BACKEND
 -int cmd__fsmonitor_client(int argc, const char **argv)
 +int cmd__fsmonitor_client(int argc UNUSED, const char **argv UNUSED)
  {
        die("fsmonitor--daemon not available on this platform");
  }

diff --cc t/helper/test-match-trees.c
index 42b20d0cecfeeaeb33668a7fa9e0ae6b72b65408,64705734dfec9e823416f2bb449b94d14d45495f..508eb7066ad278fdb925788e9262f5a554f682db
--- 1/t/helper/test-match-trees.c
--- 2/t/helper/test-match-trees.c
+++ b/t/helper/test-match-trees.c
@@@ -1,9 -1,10 +1,10 @@@
  #include "test-tool.h"
  #include "cache.h"
  #include "hex.h"
+ #include "setup.h"
  #include "tree.h"
  
 -int cmd__match_trees(int ac, const char **av)
 +int cmd__match_trees(int ac UNUSED, const char **av)
  {
        struct object_id hash1, hash2, shifted;
        struct tree *one, *two;

diff --cc t/helper/test-oid-array.c
Simple merge

diff --cc t/helper/test-oidmap.c
Simple merge

diff --cc t/helper/test-oidtree.c
index 6a18e1bce807f2d854a6cfdf26a2c5cf4f7f021d,edcb7e9f44864d33b2baff3ea0d4879b26969d6a..5b98f2f70ad94d87a7edff9d45ac449ecf71767b
--- 1/t/helper/test-oidtree.c
--- 2/t/helper/test-oidtree.c
+++ b/t/helper/test-oidtree.c
@@@ -2,8 -2,9 +2,9 @@@
  #include "cache.h"
  #include "hex.h"
  #include "oidtree.h"
+ #include "setup.h"
  
 -static enum cb_next print_oid(const struct object_id *oid, void *data)
 +static enum cb_next print_oid(const struct object_id *oid, void *data UNUSED)
  {
        puts(oid_to_hex(oid));
        return CB_CONTINUE;

diff --cc t/helper/test-reach.c
Simple merge

diff --cc t/helper/test-read-graph.c
index f92aea9d1fd7327efb754fcf190ff802c33960f2,78965a6ebdc101f5753fb0e09b4ec1a4fc482378..3ac496e27e497df4d3ba800409c0117fbb8ded1f
--- 1/t/helper/test-read-graph.c
--- 2/t/helper/test-read-graph.c
+++ b/t/helper/test-read-graph.c
@@@ -4,8 -3,9 +3,9 @@@
  #include "repository.h"
  #include "object-store.h"
  #include "bloom.h"
+ #include "setup.h"
  
 -int cmd__read_graph(int argc, const char **argv)
 +int cmd__read_graph(int argc UNUSED, const char **argv UNUSED)
  {
        struct commit_graph *graph = NULL;
        struct object_directory *odb;

diff --cc t/helper/test-ref-store.c
Simple merge

diff --cc t/helper/test-revision-walking.c
Simple merge

diff --cc t/helper/test-scrap-cache-tree.c
Simple merge

diff --cc t/helper/test-submodule-config.c
Simple merge

diff --cc t/helper/test-submodule.c
Simple merge

diff --cc t/helper/test-trace2.c
Simple merge

diff --cc tag.c
Simple merge

diff --cc transport-helper.c
Simple merge

diff --cc transport.c
Simple merge

diff --cc unpack-trees.c
Simple merge

diff --cc upload-pack.c
Simple merge

diff --cc walker.c
Simple merge

diff --cc wt-status.c
Simple merge

diff --cc xdiff-interface.c
Simple merge