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

Header clean-up.

* en/header-split-cache-h: (24 commits)
  protocol.h: move definition of DEFAULT_GIT_PORT from cache.h
  mailmap, quote: move declarations of global vars to correct unit
  treewide: reduce includes of cache.h in other headers
  treewide: remove double forward declaration of read_in_full
  cache.h: remove unnecessary includes
  treewide: remove cache.h inclusion due to pager.h changes
  pager.h: move declarations for pager.c functions from cache.h
  treewide: remove cache.h inclusion due to editor.h changes
  editor: move editor-related functions and declarations into common file
  treewide: remove cache.h inclusion due to object.h changes
  object.h: move some inline functions and defines from cache.h
  treewide: remove cache.h inclusion due to object-file.h changes
  object-file.h: move declarations for object-file.c functions from cache.h
  treewide: remove cache.h inclusion due to git-zlib changes
  git-zlib: move declarations for git-zlib functions from cache.h
  treewide: remove cache.h inclusion due to object-name.h changes
  object-name.h: move declarations for object-name.c functions from cache.h
  treewide: remove unnecessary cache.h inclusion
  treewide: be explicit about dependence on mem-pool.h
  treewide: be explicit about dependence on oid-array.h
  ...

diff --cc Makefile
Simple merge

diff --cc apply.c
Simple merge

diff --cc archive.c
Simple merge

diff --cc blame.c
Simple merge

diff --cc builtin/branch.c
Simple merge

diff --cc builtin/clone.c
Simple merge

diff --cc builtin/describe.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/fsmonitor--daemon.c
Simple merge

diff --cc builtin/gc.c
Simple merge

diff --cc builtin/log.c
Simple merge

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

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

diff --cc builtin/mktag.c
Simple merge

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

diff --cc builtin/rebase.c
Simple merge

diff --cc builtin/receive-pack.c
index 9109552533d838755a0db62b8de9bd8a671cad12,7d921170f1ca5919cb720d8106a77dc3b0b01da9..0dedcd7204743b2c4022fd49bad0f4285b8cc348
--- 1/builtin/receive-pack.c
--- 2/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@@ -32,9 -33,10 +33,11 @@@
  #include "object-store.h"
  #include "protocol.h"
  #include "commit-reach.h"
+ #include "trace.h"
+ #include "trace2.h"
  #include "worktree.h"
  #include "shallow.h"
 +#include "parse-options.h"
  #include "wrapper.h"
  
  static const char * const receive_pack_usage[] = {

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/var.c
Simple merge

diff --cc builtin/worktree.c
Simple merge

diff --cc commit-graph.c
Simple merge

diff --cc config.c
Simple merge

diff --cc connect.c
Simple merge

diff --cc date.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc fsmonitor.h
Simple merge

diff --cc git-compat-util.h
Simple merge

diff --cc git.c
Simple merge

diff --cc grep.c
Simple merge

diff --cc http-push.c
Simple merge

diff --cc http-walker.c
Simple merge

diff --cc http.c
Simple merge

diff --cc log-tree.c
Simple merge

diff --cc mailmap.c
Simple merge

diff --cc object-name.c
Simple merge

diff --cc pack-bitmap.c
Simple merge

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

diff --cc read-cache.c
Simple merge

diff --cc ref-filter.c
Simple merge

diff --cc remote-curl.c
Simple merge

diff --cc remote.c
Simple merge

diff --cc revision.c
Simple merge

diff --cc scalar.c
Simple merge

diff --cc send-pack.c
Simple merge

diff --cc sequencer.c
Simple merge

diff --cc submodule.c
Simple merge

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

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

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

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

diff --cc transport.c
Simple merge

diff --cc unpack-trees.c
Simple merge