Merge branch 'en/header-split-cache-h-part-2'

More header clean-up.

* en/header-split-cache-h-part-2: (22 commits)
  reftable: ensure git-compat-util.h is the first (indirect) include
  diff.h: reduce unnecessary includes
  object-store.h: reduce unnecessary includes
  commit.h: reduce unnecessary includes
  fsmonitor: reduce includes of cache.h
  cache.h: remove unnecessary headers
  treewide: remove cache.h inclusion due to previous changes
  cache,tree: move basic name compare functions from read-cache to tree
  cache,tree: move cmp_cache_name_compare from tree.[ch] to read-cache.c
  hash-ll.h: split out of hash.h to remove dependency on repository.h
  tree-diff.c: move S_DIFFTREE_IFXMIN_NEQ define from cache.h
  dir.h: move DTYPE defines from cache.h
  versioncmp.h: move declarations for versioncmp.c functions from cache.h
  ws.h: move declarations for ws.c functions from cache.h
  match-trees.h: move declarations for match-trees.c functions from cache.h
  pkt-line.h: move declarations for pkt-line.c functions from cache.h
  base85.h: move declarations for base85.c functions from cache.h
  copy.h: move declarations for copy.c functions from cache.h
  server-info.h: move declarations for server-info.c functions from cache.h
  packfile.h: move pack_window and pack_entry from cache.h
  ...

diff --cc apply.c
Simple merge

diff --cc archive.c
Simple merge

diff --cc builtin/clone.c
Simple merge

diff --cc builtin/diff.c
Simple merge

diff --cc builtin/difftool.c
Simple merge

diff --cc builtin/fetch.c
Simple merge

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

diff --cc builtin/gc.c
Simple merge

diff --cc builtin/log.c
Simple merge

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

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

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

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

diff --cc builtin/repack.c
Simple merge

diff --cc builtin/upload-archive.c
Simple merge

diff --cc builtin/worktree.c
Simple merge

diff --cc builtin/write-tree.c
index 32e302a813d56a22320c988ae26a69f98aa22a94,6085f64d1009528a9e21a888755c649480ae87ed..84b83318c967d1401792a99ca85ca433812e6885
--- 1/builtin/write-tree.c
--- 2/builtin/write-tree.c
+++ b/builtin/write-tree.c
@@@ -13,6 -13,6 +13,7 @@@
  #include "tree.h"
  #include "cache-tree.h"
  #include "parse-options.h"
++#include "repository.h"
  
  static const char * const write_tree_usage[] = {
        N_("git write-tree [--missing-ok] [--prefix=<prefix>/]"),

diff --cc bundle-uri.c
Simple merge

diff --cc commit-graph.c
Simple merge

diff --cc commit.c
Simple merge

diff --cc config.c
Simple merge

diff --cc date.c
Simple merge

diff --cc diagnose.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc diff.h
Simple merge

diff --cc fetch-pack.c
Simple merge

diff --cc gpg-interface.c
Simple merge

diff --cc grep.c
Simple merge

diff --cc hashmap.h
Simple merge

diff --cc http-push.c
Simple merge

diff --cc log-tree.c
Simple merge

diff --cc merge-ort.c
Simple merge

diff --cc midx.c
Simple merge

diff --cc object-file.c
Simple merge

diff --cc object-name.c
Simple merge

diff --cc object-store.h
Simple merge

diff --cc packfile.c
Simple merge

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

diff --cc protocol-caps.c
Simple merge

diff --cc read-cache.c
Simple merge

diff --cc ref-filter.c
Simple merge

diff --cc refs/packed-backend.c
Simple merge

diff --cc revision.h
Simple merge

diff --cc send-pack.c
Simple merge

diff --cc sequencer.c
Simple merge

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

diff --cc t/helper/test-dump-fsmonitor.c
index 7c6f50158bb09462ca94ba37c8c01960e5924af8,6dc495833758d2fbb63997438c1edfbb90c30bff..9a098a25cba7f32381d1a96459eb39434c1e5c16
--- 1/t/helper/test-dump-fsmonitor.c
--- 2/t/helper/test-dump-fsmonitor.c
+++ b/t/helper/test-dump-fsmonitor.c
@@@ -1,8 -1,9 +1,9 @@@
  #include "test-tool.h"
  #include "cache.h"
+ #include "repository.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-untracked-cache.c
Simple merge

diff --cc t/helper/test-example-decorate.c
index 2cf302ffcb3be7d82be344ce276879dded42d81a,43707486dd410dacb4d14c1a8750029e1b52672e..2ed910adaa3da3b5db771679ccb1eefb0a8da2f5
--- 1/t/helper/test-example-decorate.c
--- 2/t/helper/test-example-decorate.c
+++ b/t/helper/test-example-decorate.c
@@@ -2,8 -2,9 +2,9 @@@
  #include "git-compat-util.h"
  #include "object.h"
  #include "decorate.h"
+ #include "repository.h"
  
 -int cmd__example_decorate(int argc, const char **argv)
 +int cmd__example_decorate(int argc UNUSED, const char **argv UNUSED)
  {
        struct decoration n;
        struct object_id one_oid = { {1} };

diff --cc t/helper/test-fsmonitor-client.c
Simple merge

diff --cc t/helper/test-match-trees.c
Simple merge

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

diff --cc t/helper/test-oidmap.c
index d9931544a8c24032e52a1aecfd245f24ff9d4482,bba4099f65ff5d648815cd3ab63bed5e8fd498cf..bd30244a54cc88370ab27da5d25108b78c296f85
--- 1/t/helper/test-oidmap.c
--- 2/t/helper/test-oidmap.c
+++ b/t/helper/test-oidmap.c
@@@ -2,9 -2,9 +2,10 @@@
  #include "hex.h"
  #include "object-name.h"
  #include "oidmap.h"
+ #include "repository.h"
  #include "setup.h"
  #include "strbuf.h"
 +#include "string-list.h"
  
  /* key is an oid and value is a name (could be a refname for example) */
  struct test_entry {

diff --cc t/helper/test-oidtree.c
index 5b98f2f70ad94d87a7edff9d45ac449ecf71767b,dc509fb8065849e83eb156cd7dbda8ce3f46bec3..c7a1d4c6420118e06923b2aa0f28cc6f8e983edc
--- 1/t/helper/test-oidtree.c
--- 2/t/helper/test-oidtree.c
+++ b/t/helper/test-oidtree.c
@@@ -2,9 -2,9 +2,9 @@@
  #include "hex.h"
  #include "oidtree.h"
  #include "setup.h"
+ #include "strbuf.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-parse-options.c
Simple merge

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

diff --cc t/helper/test-string-list.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 unpack-trees.c
Simple merge

diff --cc versioncmp.c
Simple merge