diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-05-08 08:21:21 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-05-08 08:21:21 -0700 |
commit | 4bd872e0ed3a005bd8cb2d965a46d055327750d5 (patch) | |
tree | 458726dbe846a32d28e6d4e0d14932b73f6c691f /diff.c | |
parent | 69c786637d7a7fe3b2b8f7d989af095f5f49c3a8 (diff) | |
parent | e3a3f5edf52c7f6161b167058b4d7c3a31dc0c3b (diff) | |
download | git-4bd872e0ed3a005bd8cb2d965a46d055327750d5.tar.gz |
Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-part-3
* 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
...
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -4,6 +4,7 @@ #include "cache.h" #include "abspath.h" #include "alloc.h" +#include "base85.h" #include "config.h" #include "convert.h" #include "environment.h" @@ -40,6 +41,7 @@ #include "object-name.h" #include "setup.h" #include "strmap.h" +#include "ws.h" #include "wrapper.h" #ifdef NO_FAST_WORKING_DIRECTORY |