Skip to content

Commit 3bc315c

Browse files
committed
Merge branch 'en/header-cleanup' into seen
Remove unused header "#include". Has a few interactions with topics in flight. * en/header-cleanup: treewide: remove unnecessary includes in source files treewide: add direct includes currently only pulled in transitively trace2/tr2_tls.h: remove unnecessary include submodule-config.h: remove unnecessary include pkt-line.h: remove unnecessary include line-log.h: remove unnecessary include http.h: remove unnecessary include fsmonitor--daemon.h: remove unnecessary includes blame.h: remove unnecessary includes archive.h: remove unnecessary include treewide: remove unnecessary includes in source files treewide: remove unnecessary includes from header files
2 parents 0be783e + 6b0eec0 commit 3bc315c

File tree

192 files changed

+26
-337
lines changed

Some content is hidden

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

192 files changed

+26
-337
lines changed

add-patch.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include "strvec.h"
1313
#include "pathspec.h"
1414
#include "color.h"
15-
#include "diff.h"
1615
#include "compat/terminal.h"
1716
#include "prompt.h"
1817

apply.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include "base85.h"
1313
#include "config.h"
1414
#include "object-store-ll.h"
15-
#include "blob.h"
1615
#include "delta.h"
1716
#include "diff.h"
1817
#include "dir.h"

archive-tar.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "tar.h"
1010
#include "archive.h"
1111
#include "object-store-ll.h"
12+
#include "strbuf.h"
1213
#include "streaming.h"
1314
#include "run-command.h"
1415
#include "write-or-die.h"

archive-zip.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "streaming.h"
1111
#include "utf8.h"
1212
#include "object-store-ll.h"
13+
#include "strbuf.h"
1314
#include "userdiff.h"
1415
#include "write-or-die.h"
1516
#include "xdiff-interface.h"

archive.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "environment.h"
66
#include "gettext.h"
77
#include "hex.h"
8+
#include "object-name.h"
89
#include "path.h"
910
#include "pretty.h"
1011
#include "setup.h"
@@ -17,7 +18,6 @@
1718
#include "archive.h"
1819
#include "parse-options.h"
1920
#include "unpack-trees.h"
20-
#include "dir.h"
2121
#include "quote.h"
2222

2323
static char const * const archive_usage[] = {

archive.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#ifndef ARCHIVE_H
22
#define ARCHIVE_H
33

4-
#include "object-name.h"
54
#include "pathspec.h"
65
#include "string-list.h"
76

attr.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "quote.h"
1919
#include "read-cache-ll.h"
2020
#include "refs.h"
21-
#include "revision.h"
2221
#include "object-store-ll.h"
2322
#include "setup.h"
2423
#include "thread-utils.h"

bisect.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "refs.h"
1010
#include "list-objects.h"
1111
#include "quote.h"
12-
#include "hash-lookup.h"
1312
#include "run-command.h"
1413
#include "log-tree.h"
1514
#include "bisect.h"

blame.c

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

blame.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
#ifndef BLAME_H
22
#define BLAME_H
33

4-
#include "commit.h"
54
#include "oidset.h"
65
#include "xdiff-interface.h"
7-
#include "revision.h"
86
#include "prio-queue.h"
9-
#include "diff.h"
107

118
#define PICKAXE_BLAME_MOVE 01
129
#define PICKAXE_BLAME_COPY 02

blob.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "git-compat-util.h"
22
#include "blob.h"
3-
#include "repository.h"
43
#include "alloc.h"
54

65
const char *blob_type = "blob";

bloom.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#include "bloom.h"
33
#include "diff.h"
44
#include "diffcore.h"
5-
#include "revision.h"
65
#include "hashmap.h"
76
#include "commit-graph.h"
87
#include "commit.h"

builtin/add.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,11 @@
1212
#include "dir.h"
1313
#include "gettext.h"
1414
#include "pathspec.h"
15-
#include "exec-cmd.h"
16-
#include "cache-tree.h"
1715
#include "run-command.h"
1816
#include "parse-options.h"
1917
#include "path.h"
2018
#include "preload-index.h"
2119
#include "diff.h"
22-
#include "diffcore.h"
2320
#include "read-cache.h"
2421
#include "repository.h"
2522
#include "revision.h"

builtin/am.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include "config.h"
1111
#include "editor.h"
1212
#include "environment.h"
13-
#include "exec-cmd.h"
1413
#include "gettext.h"
1514
#include "hex.h"
1615
#include "parse-options.h"
@@ -24,7 +23,6 @@
2423
#include "refs.h"
2524
#include "commit.h"
2625
#include "diff.h"
27-
#include "diffcore.h"
2826
#include "unpack-trees.h"
2927
#include "branch.h"
3028
#include "object-name.h"
@@ -35,11 +33,9 @@
3533
#include "log-tree.h"
3634
#include "notes-utils.h"
3735
#include "rerere.h"
38-
#include "prompt.h"
3936
#include "mailinfo.h"
4037
#include "apply.h"
4138
#include "string-list.h"
42-
#include "packfile.h"
4339
#include "pager.h"
4440
#include "path.h"
4541
#include "repository.h"

builtin/apply.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "builtin.h"
22
#include "gettext.h"
3-
#include "parse-options.h"
43
#include "repository.h"
54
#include "apply.h"
65

builtin/archive.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "parse-options.h"
1010
#include "pkt-line.h"
1111
#include "repository.h"
12-
#include "sideband.h"
1312

1413
static void create_output_file(const char *output_file)
1514
{

builtin/bisect.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include "parse-options.h"
88
#include "bisect.h"
99
#include "refs.h"
10-
#include "dir.h"
1110
#include "strvec.h"
1211
#include "run-command.h"
1312
#include "oid-array.h"

builtin/blame.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "userdiff.h"
2626
#include "line-range.h"
2727
#include "line-log.h"
28-
#include "dir.h"
2928
#include "progress.h"
3029
#include "object-name.h"
3130
#include "object-store-ll.h"

builtin/branch.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,10 @@
1717
#include "remote.h"
1818
#include "parse-options.h"
1919
#include "branch.h"
20-
#include "diff.h"
2120
#include "path.h"
22-
#include "revision.h"
2321
#include "string-list.h"
2422
#include "column.h"
2523
#include "utf8.h"
26-
#include "wt-status.h"
2724
#include "ref-filter.h"
2825
#include "worktree.h"
2926
#include "help.h"

builtin/cat-file.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "parse-options.h"
1616
#include "userdiff.h"
1717
#include "streaming.h"
18-
#include "tree-walk.h"
1918
#include "oid-array.h"
2019
#include "packfile.h"
2120
#include "object-file.h"

builtin/checkout-index.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#define USE_THE_INDEX_VARIABLE
88
#include "builtin.h"
99
#include "config.h"
10-
#include "dir.h"
1110
#include "gettext.h"
1211
#include "lockfile.h"
1312
#include "quote.h"

builtin/checkout.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#define USE_THE_INDEX_VARIABLE
22
#include "builtin.h"
33
#include "advice.h"
4-
#include "blob.h"
54
#include "branch.h"
65
#include "cache-tree.h"
76
#include "checkout.h"
@@ -27,10 +26,8 @@
2726
#include "remote.h"
2827
#include "resolve-undo.h"
2928
#include "revision.h"
30-
#include "run-command.h"
3129
#include "setup.h"
3230
#include "submodule.h"
33-
#include "submodule-config.h"
3431
#include "symlinks.h"
3532
#include "trace2.h"
3633
#include "tree.h"

builtin/clone.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "hex.h"
2020
#include "lockfile.h"
2121
#include "parse-options.h"
22-
#include "fetch-pack.h"
2322
#include "refs.h"
2423
#include "refspec.h"
2524
#include "object-file.h"

builtin/commit-graph.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
#include "builtin.h"
22
#include "commit.h"
33
#include "config.h"
4-
#include "dir.h"
54
#include "environment.h"
65
#include "gettext.h"
76
#include "hex.h"
8-
#include "lockfile.h"
97
#include "parse-options.h"
108
#include "repository.h"
119
#include "commit-graph.h"
1210
#include "object-store-ll.h"
1311
#include "progress.h"
1412
#include "replace-object.h"
13+
#include "strbuf.h"
1514
#include "tag.h"
1615
#include "trace2.h"
1716

builtin/commit-tree.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
#include "object-store-ll.h"
1212
#include "repository.h"
1313
#include "commit.h"
14-
#include "tree.h"
15-
#include "utf8.h"
16-
#include "gpg-interface.h"
1714
#include "parse-options.h"
1815

1916
static const char * const commit_tree_usage[] = {

builtin/commit.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,12 @@
1616
#include "editor.h"
1717
#include "environment.h"
1818
#include "diff.h"
19-
#include "diffcore.h"
2019
#include "commit.h"
2120
#include "gettext.h"
2221
#include "revision.h"
2322
#include "wt-status.h"
2423
#include "run-command.h"
25-
#include "hook.h"
26-
#include "refs.h"
27-
#include "log-tree.h"
2824
#include "strbuf.h"
29-
#include "utf8.h"
3025
#include "object-name.h"
3126
#include "parse-options.h"
3227
#include "path.h"
@@ -35,9 +30,6 @@
3530
#include "string-list.h"
3631
#include "rerere.h"
3732
#include "unpack-trees.h"
38-
#include "quote.h"
39-
#include "submodule.h"
40-
#include "gpg-interface.h"
4133
#include "column.h"
4234
#include "sequencer.h"
4335
#include "sparse-index.h"

builtin/credential-cache.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
#ifndef NO_UNIX_SOCKETS
99

10-
#include "credential.h"
11-
#include "string-list.h"
1210
#include "unix-socket.h"
1311
#include "run-command.h"
1412

builtin/describe.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
#include "lockfile.h"
88
#include "commit.h"
99
#include "tag.h"
10-
#include "blob.h"
1110
#include "refs.h"
12-
#include "exec-cmd.h"
1311
#include "object-name.h"
1412
#include "parse-options.h"
1513
#include "read-cache-ll.h"

builtin/diff-files.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "preload-index.h"
1212
#include "repository.h"
1313
#include "revision.h"
14-
#include "submodule.h"
1514

1615
static const char diff_files_usage[] =
1716
"git diff-files [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]"

builtin/diff-index.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
#include "repository.h"
88
#include "revision.h"
99
#include "setup.h"
10-
#include "sparse-index.h"
11-
#include "submodule.h"
1210

1311
static const char diff_cache_usage[] =
1412
"git diff-index [-m] [--cached] [--merge-base] "

builtin/diff-tree.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include "gettext.h"
77
#include "hex.h"
88
#include "log-tree.h"
9-
#include "submodule.h"
109
#include "read-cache-ll.h"
1110
#include "repository.h"
1211
#include "revision.h"

builtin/diff.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include "lockfile.h"
1111
#include "color.h"
1212
#include "commit.h"
13-
#include "blob.h"
1413
#include "gettext.h"
1514
#include "tag.h"
1615
#include "diff.h"
@@ -21,7 +20,6 @@
2120
#include "revision.h"
2221
#include "log-tree.h"
2322
#include "setup.h"
24-
#include "submodule.h"
2523
#include "oid-array.h"
2624
#include "tree.h"
2725

builtin/difftool.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "copy.h"
1919
#include "run-command.h"
2020
#include "environment.h"
21-
#include "exec-cmd.h"
2221
#include "gettext.h"
2322
#include "hex.h"
2423
#include "parse-options.h"

builtin/fast-export.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "quote.h"
2626
#include "remote.h"
2727
#include "blob.h"
28-
#include "commit-slab.h"
2928

3029
static const char *fast_export_usage[] = {
3130
N_("git fast-export [<rev-list-opts>]"),

builtin/fetch.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include "connected.h"
2727
#include "strvec.h"
2828
#include "utf8.h"
29-
#include "packfile.h"
3029
#include "pager.h"
3130
#include "path.h"
3231
#include "pkt-line.h"
@@ -38,7 +37,6 @@
3837
#include "shallow.h"
3938
#include "trace.h"
4039
#include "trace2.h"
41-
#include "worktree.h"
4240
#include "bundle-uri.h"
4341

4442
#define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000)

0 commit comments

Comments
 (0)