Skip to content

Commit 0807e57

Browse files
committed
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 ...
2 parents 9ce9dea + 331b094 commit 0807e57

File tree

217 files changed

+827
-479
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

217 files changed

+827
-479
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1032,6 +1032,7 @@ LIB_OBJS += fsmonitor.o
10321032
LIB_OBJS += fsmonitor-ipc.o
10331033
LIB_OBJS += fsmonitor-settings.o
10341034
LIB_OBJS += gettext.o
1035+
LIB_OBJS += git-zlib.o
10351036
LIB_OBJS += gpg-interface.o
10361037
LIB_OBJS += graph.o
10371038
LIB_OBJS += grep.o
@@ -1192,7 +1193,6 @@ LIB_OBJS += write-or-die.o
11921193
LIB_OBJS += ws.o
11931194
LIB_OBJS += wt-status.o
11941195
LIB_OBJS += xdiff-interface.o
1195-
LIB_OBJS += zlib.o
11961196

11971197
BUILTIN_OBJS += builtin/add.o
11981198
BUILTIN_OBJS += builtin/am.o

add-patch.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
#include "cache.h"
22
#include "add-interactive.h"
3+
#include "advice.h"
34
#include "alloc.h"
5+
#include "editor.h"
46
#include "environment.h"
57
#include "gettext.h"
8+
#include "object-name.h"
69
#include "strbuf.h"
710
#include "run-command.h"
811
#include "strvec.h"

apply.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
#include "xdiff-interface.h"
2323
#include "ll-merge.h"
2424
#include "lockfile.h"
25+
#include "object-name.h"
26+
#include "object-file.h"
2527
#include "parse-options.h"
2628
#include "quote.h"
2729
#include "rerere.h"

archive-tar.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "alloc.h"
66
#include "config.h"
77
#include "gettext.h"
8+
#include "git-zlib.h"
89
#include "hex.h"
910
#include "tar.h"
1011
#include "archive.h"

archive-zip.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "config.h"
66
#include "archive.h"
77
#include "gettext.h"
8+
#include "git-zlib.h"
89
#include "hex.h"
910
#include "streaming.h"
1011
#include "utf8.h"

archive.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include "abspath.h"
33
#include "alloc.h"
44
#include "config.h"
5+
#include "convert.h"
56
#include "environment.h"
67
#include "gettext.h"
78
#include "hex.h"

archive.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#ifndef ARCHIVE_H
22
#define ARCHIVE_H
33

4-
#include "cache.h"
4+
#include "object-name.h"
55
#include "pathspec.h"
6+
#include "string-list.h"
67

78
struct repository;
89
struct pretty_print_context;

bisect.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "cache.h"
1+
#include "git-compat-util.h"
22
#include "config.h"
33
#include "commit.h"
44
#include "diff.h"
@@ -17,6 +17,7 @@
1717
#include "strvec.h"
1818
#include "commit-slab.h"
1919
#include "commit-reach.h"
20+
#include "object-name.h"
2021
#include "object-store.h"
2122
#include "dir.h"
2223

blame.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
#include "object-store.h"
44
#include "cache-tree.h"
55
#include "mergesort.h"
6+
#include "convert.h"
67
#include "diff.h"
78
#include "diffcore.h"
89
#include "gettext.h"
910
#include "hex.h"
1011
#include "setup.h"
1112
#include "tag.h"
13+
#include "trace2.h"
1214
#include "blame.h"
1315
#include "alloc.h"
1416
#include "commit-slab.h"

branch.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#include "git-compat-util.h"
2-
#include "cache.h"
2+
#include "advice.h"
33
#include "config.h"
44
#include "branch.h"
55
#include "environment.h"
66
#include "gettext.h"
77
#include "hex.h"
8+
#include "object-name.h"
89
#include "refs.h"
910
#include "refspec.h"
1011
#include "remote.h"

0 commit comments

Comments
 (0)