]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'en/header-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Mar 2023 21:03:08 +0000 (14:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Mar 2023 21:03:09 +0000 (14:03 -0700)
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

20 files changed:
1  2 
archive.c
builtin/credential-cache--daemon.c
builtin/fetch.c
builtin/fsck.c
builtin/log.c
builtin/read-tree.c
delta-islands.c
diff.c
diff.h
dir-iterator.c
dir.c
dir.h
git.c
gpg-interface.c
refs.c
sequencer.c
t/helper/test-ctype.c
trace.h
unpack-trees.c
userdiff.c

diff --cc archive.c
Simple merge
Simple merge
diff --cc builtin/fetch.c
Simple merge
diff --cc builtin/fsck.c
index 64614b43b2ea60e072bc8b85de7e96de18018616,134b0bd18cd7d4cc207fcc580f95367df848b13a..e468e55325b8d98c41323c89dc3885b37e39e2c3
@@@ -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"
diff --cc builtin/log.c
Simple merge
Simple merge
diff --cc delta-islands.c
Simple merge
diff --cc diff.c
Simple merge
diff --cc diff.h
Simple merge
diff --cc dir-iterator.c
Simple merge
diff --cc dir.c
Simple merge
diff --cc dir.h
Simple merge
diff --cc git.c
Simple merge
diff --cc gpg-interface.c
Simple merge
diff --cc refs.c
Simple merge
diff --cc sequencer.c
Simple merge
Simple merge
diff --cc trace.h
Simple merge
diff --cc unpack-trees.c
Simple merge
diff --cc userdiff.c
Simple merge