From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 25 Apr 2023 20:56:19 +0000 (-0700)
Subject: Merge branch 'en/header-split-cache-h'
X-Git-Tag: v2.41.0-rc0~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0807e57807aaffe2813fffb7704dcc9153f03832;p=thirdparty%2Fgit.git

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
  ...
---

0807e57807aaffe2813fffb7704dcc9153f03832
diff --cc builtin/receive-pack.c
index 9109552533,7d921170f1..0dedcd7204
--- a/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[] = {