From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 17 Mar 2023 21:03:08 +0000 (-0700)
Subject: Merge branch 'en/header-cleanup'
X-Git-Tag: v2.41.0-rc0~164
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88cc8ed8bc7d4bc9521b426e95ae2a38d3aec13a;p=thirdparty%2Fgit.git

Merge branch 'en/header-cleanup'

Code clean-up to clarify the rule that "git-compat-util.h" must be
the first to be included.

* en/header-cleanup:
  diff.h: remove unnecessary include of object.h
  Remove unnecessary includes of builtin.h
  treewide: replace cache.h with more direct headers, where possible
  replace-object.h: move read_replace_refs declaration from cache.h to here
  object-store.h: move struct object_info from cache.h
  dir.h: refactor to no longer need to include cache.h
  object.h: stop depending on cache.h; make cache.h depend on object.h
  ident.h: move ident-related declarations out of cache.h
  pretty.h: move has_non_ascii() declaration from commit.h
  cache.h: remove dependence on hex.h; make other files include it explicitly
  hex.h: move some hex-related declarations from cache.h
  hash.h: move some oid-related declarations from cache.h
  alloc.h: move ALLOC_GROW() functions from cache.h
  treewide: remove unnecessary cache.h includes in source files
  treewide: remove unnecessary cache.h includes
  treewide: remove unnecessary git-compat-util.h includes in headers
  treewide: ensure one of the appropriate headers is sourced first
---

88cc8ed8bc7d4bc9521b426e95ae2a38d3aec13a
diff --cc builtin/fsck.c
index 64614b43b2,134b0bd18c..e468e55325
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@@ -1,5 -1,7 +1,6 @@@
 -#define USE_THE_INDEX_VARIABLE
  #include "builtin.h"
  #include "cache.h"
+ #include "hex.h"
  #include "repository.h"
  #include "config.h"
  #include "commit.h"