diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-04-25 22:56:19 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-25 22:56:20 +0200 |
| commit | 0807e57807aaffe2813fffb7704dcc9153f03832 (patch) | |
| tree | c6a5e764ff9a3e24c7b054ade453c161c2c4b2e5 /pack-bitmap.c | |
| parent | Sync with Git 2.40.1 (diff) | |
| parent | protocol.h: move definition of DEFAULT_GIT_PORT from cache.h (diff) | |
| download | git-0807e57807aaffe2813fffb7704dcc9153f03832.tar.xz git-0807e57807aaffe2813fffb7704dcc9153f03832.zip | |
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
...
Diffstat (limited to 'pack-bitmap.c')
| -rw-r--r-- | pack-bitmap.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pack-bitmap.c b/pack-bitmap.c index b2e7d06d60..295b8abc19 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "alloc.h" #include "commit.h" #include "gettext.h" @@ -15,6 +15,8 @@ #include "pack-objects.h" #include "packfile.h" #include "repository.h" +#include "trace2.h" +#include "object-file.h" #include "object-store.h" #include "list-objects-filter-options.h" #include "midx.h" |