Additional header cleanups (removing unnecessary includes)
cover Additional header cleanups (removing unnecessary includes)
Several months ago, I sent in several series cleaning up headers, ultimately removing cache.h. I had two other series ready to share, but...life happened.
I've rebased and cleaned up these last two series, focusing on just reducing unnecessary includes. Here's the first of the two.
Elijah Newren (12):
treewide: remove unnecessary includes from header files
treewide: remove unnecessary includes in source files archive.h: remove unnecessary include
blame.h: remove unnecessary includes fsmonitor--daemon.h: remove unnecessary includes
http.h: remove unnecessary include
line-log.h: remove unnecessary include
pkt-line.h: remove unnecessary include submodule-config.h: remove unnecessary include trace2/tr2_tls.h: remove unnecessary include
treewide: add direct includes currently only pulled in transitively
treewide: remove unnecessary includes in source files
add-patch.c | 1 - apply.c | 1 - archive-tar.c | 1 + archive-zip.c | 1 + archive.c | 2 +- archive.h | 1 - attr.c | 1 - bisect.c | 1 - blame.c | 2 ++ blame.h | 3 --- blob.c | 1 - bloom.c | 1 - builtin/add.c | 3 --- builtin/am.c | 4 ---- builtin/apply.c | 1 - builtin/archive.c | 1 - builtin/bisect.c | 1 - builtin/blame.c | 1 - builtin/branch.c | 3 --- builtin/cat-file.c | 1 - builtin/checkout-index.c | 1 - builtin/checkout.c | 3 --- builtin/clone.c | 1 - builtin/commit-graph.c | 3 +-- builtin/commit-tree.c | 3 --- builtin/commit.c | 8 -------- builtin/credential-cache.c | 2 -- builtin/describe.c | 2 -- builtin/diff-files.c | 1 - builtin/diff-index.c | 2 -- builtin/diff-tree.c | 1 - builtin/diff.c | 2 -- builtin/difftool.c | 1 - builtin/fast-export.c | 1 - builtin/fetch.c | 2 -- builtin/for-each-ref.c | 3 +-- builtin/fsck.c | 3 --- builtin/fsmonitor--daemon.c | 5 +++-- builtin/get-tar-commit-id.c | 1 - builtin/grep.c | 4 ---- builtin/hash-object.c | 1 - builtin/hook.c | 1 - builtin/index-pack.c | 2 -- builtin/init-db.c | 1 - builtin/log.c | 2 -- builtin/ls-files.c | 4 ---- builtin/ls-remote.c | 1 - builtin/ls-tree.c | 2 -- builtin/mailinfo.c | 1 - builtin/merge-base.c | 3 --- builtin/merge-recursive.c | 3 --- builtin/merge-tree.c | 1 - builtin/merge.c | 4 ---- builtin/mktag.c | 1 - builtin/mv.c | 1 - builtin/notes.c | 2 -- builtin/pack-objects.c | 3 --- builtin/pull.c | 5 ----- builtin/push.c | 1 - builtin/range-diff.c | 1 - builtin/read-tree.c | 2 -- builtin/rebase.c | 4 ---- builtin/receive-pack.c | 1 - builtin/repack.c | 1 - builtin/rerere.c | 1 - builtin/reset.c | 3 --- builtin/rev-list.c | 2 -- builtin/revert.c | 2 -- builtin/rm.c | 1 - builtin/send-pack.c | 5 ----- builtin/show-ref.c | 1 - builtin/sparse-checkout.c | 4 ---- builtin/stash.c | 1 - builtin/submodule--helper.c | 1 - builtin/tag.c | 1 - builtin/unpack-objects.c | 4 ---- builtin/update-ref.c | 1 - builtin/verify-commit.c | 2 -- builtin/verify-tag.c | 1 - bulk-checkin.c | 1 - bundle-uri.c | 1 - cache-tree.c | 1 - combine-diff.c | 1 - commit-graph.c | 3 +-- commit-reach.c | 1 - commit.c | 2 -- compat/fsmonitor/fsm-health-win32.c | 1 + compat/fsmonitor/fsm-listen-darwin.c | 1 + compat/fsmonitor/fsm-listen-win32.c | 1 + compat/simple-ipc/ipc-shared.c | 3 --- compat/simple-ipc/ipc-unix-socket.c | 1 - config.c | 3 --- delta-islands.c | 5 ----- diff-lib.c | 1 - diff-no-index.c | 3 --- diff.c | 2 -- diffcore-break.c | 1 - diffcore-delta.c | 1 - dir.c | 1 - entry.c | 1 - exec-cmd.c | 1 - fetch-pack.c | 2 -- fetch-pack.h | 1 - fsck.c | 1 - fsmonitor--daemon.h | 4 +--- fsmonitor-ipc.c | 1 - gettext.c | 2 -- gpg-interface.c | 1 - grep.c | 1 - http-fetch.c | 2 +- http-push.c | 3 +-- http-walker.c | 1 - http.c | 2 -- http.h | 1 - imap-send.c | 2 -- line-log.c | 4 +--- line-log.h | 2 -- line-range.c | 1 - list-objects-filter-options.c | 5 ----- list-objects-filter.c | 5 ----- log-tree.c | 1 + ls-refs.c | 1 - merge-blobs.c | 2 -- merge-ort.c | 3 --- merge-recursive.c | 5 ----- merge.c | 3 --- midx.h | 1 - negotiator/noop.c | 1 - notes-utils.c | 1 - notes.c | 2 -- object-file.c | 8 -------- object-name.c | 2 -- pack-bitmap-write.c | 3 --- pack-check.c | 1 - pack-write.c | 1 - packfile.c | 1 - parse-options.c | 2 -- patch-ids.c | 1 - pkt-line.c | 1 + pkt-line.h | 1 - protocol-caps.c | 1 - reachable.c | 1 - read-cache.c | 2 -- ref-filter.c | 3 --- ref-filter.h | 1 - reflog.c | 1 - refs/files-backend.c | 2 -- refs/packed-backend.c | 1 - refs/ref-cache.c | 1 - reftable/dump.c | 2 -- reftable/generic.c | 1 - reftable/merged.c | 1 - reftable/merged_test.c | 1 - reftable/reader.c | 1 - reftable/readwrite_test.c | 1 - reftable/refname_test.c | 1 - reftable/stack_test.c | 1 - reftable/test_framework.c | 1 - reftable/tree_test.c | 2 -- remote-curl.c | 3 +-- remote.c | 1 - repo-settings.c | 1 - rerere.c | 2 -- reset.c | 1 - revision.c | 2 -- run-command.c | 2 -- send-pack.c | 2 -- sequencer.c | 3 --- setup.c | 1 - shallow.c | 1 - shell.c | 1 - submodule-config.h | 2 -- submodule.c | 3 --- t/helper/test-bundle-uri.c | 2 -- t/helper/test-fast-rebase.c | 1 - t/helper/test-pkt-line.c | 1 + t/helper/test-reach.c | 2 -- t/helper/test-repository.c | 2 -- t/helper/test-simple-ipc.c | 1 - t/helper/test-submodule.c | 1 + t/helper/test-trace2.c | 1 - tmp-objdir.c | 1 - trace2.c | 4 ---- trace2/tr2_ctr.c | 1 - trace2/tr2_tgt_normal.c | 1 + trace2/tr2_tls.c | 1 + trace2/tr2_tls.h | 1 - trace2/tr2_tmr.c | 1 - transport-helper.c | 2 -- transport.c | 3 --- tree.c | 3 --- upload-pack.c | 6 ------ wrapper.c | 1 - xdiff-interface.c | 2 -- 194 files changed, 25 insertions(+), 339 deletions(-)
base-commit: 564d0252ca632e0264ed670534a51d18a689ef5d
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1617%2Fnewren%2Fheader-cleanup-6-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1617/newren/header-cleanup-6-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1617
Signature · 1 line
gitgitgadget
PATCH 1/12 treewide: remove unnecessary includes from header files
From: Elijah Newren <[email protected]>
There are three kinds of unnecessary includes:
* includes which aren't directly needed, but which include some other forgotten include
* includes which could be replaced by a simple forward declaration of some structs
* includes which aren't needed at all
Remove the third kind of include. Subsequent commits (and a subsequent series) will work on removing some of the other kinds of includes.
Signed-off-by Elijah Newren <[email protected]>
--- fetch-pack.h | 1 - midx.h | 1 - ref-filter.h | 1 - submodule-config.h | 1 - 4 files changed, 4 deletions(-)
fetch-pack.h +0 -1
@@ -2,7 +2,6 @@#define FETCH_PACK_H #include "string-list.h" -#include "run-command.h" #include "protocol.h" #include "list-objects-filter-options.h" #include "oidset.h"
midx.h +0 -1
@@ -1,7 +1,6 @@#ifndef MIDX_H #define MIDX_H -#include "repository.h" #include "string-list.h" struct object_id ;
ref-filter.h +0 -1
@@ -3,7 +3,6 @@#include "gettext.h" #include "oid-array.h" -#include "refs.h" #include "commit.h" #include "string-list.h" #include "strvec.h"
submodule-config.h +0 -1
@@ -2,7 +2,6 @@#define SUBMODULE_CONFIG_CACHE_H #include "config.h" -#include "hashmap.h" #include "submodule.h" #include "strbuf.h" #include "tree-walk.h"
Signature · 1 line
gitgitgadget
PATCH 2/12 treewide: remove unnecessary includes in source files
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
Each of these were checked with
gcc -E -I. ${SOURCE_FILE} | grep ${HEADER_FILE}
to ensure that removing the direct inclusion of the header actually resulted in that header no longer being included at all (i.e. that no other header pulled it in transitively).
...except for a few cases where we verified that although the header was brought in transitively, nothing from it was directly used in that source file. These cases were:
* builtin/credential-cache.c
* builtin/pull.c
* builtin/send-pack.c
Signed-off-by Elijah Newren <[email protected]>
--- add-patch.c | 1 - apply.c | 1 - archive.c | 1 - attr.c | 1 - bisect.c | 1 - blob.c | 1 - bloom.c | 1 - builtin/add.c | 3 --- builtin/am.c | 4 ---- builtin/apply.c | 1 - builtin/bisect.c | 1 - builtin/blame.c | 1 - builtin/branch.c | 3 --- builtin/cat-file.c | 1 - builtin/checkout-index.c | 1 - builtin/checkout.c | 3 --- builtin/clone.c | 1 - builtin/commit-graph.c | 1 - builtin/commit-tree.c | 3 --- builtin/commit.c | 8 -------- builtin/credential-cache.c | 2 -- builtin/describe.c | 2 -- builtin/diff-files.c | 1 - builtin/diff-index.c | 2 -- builtin/diff-tree.c | 1 - builtin/diff.c | 2 -- builtin/difftool.c | 1 - builtin/fast-export.c | 1 - builtin/fetch.c | 2 -- builtin/for-each-ref.c | 2 -- builtin/fsck.c | 2 -- builtin/get-tar-commit-id.c | 1 - builtin/grep.c | 3 --- builtin/hash-object.c | 1 - builtin/hook.c | 1 - builtin/index-pack.c | 2 -- builtin/init-db.c | 1 - builtin/log.c | 2 -- builtin/ls-files.c | 4 ---- builtin/ls-remote.c | 1 - builtin/ls-tree.c | 2 -- builtin/mailinfo.c | 1 - builtin/merge-base.c | 3 --- builtin/merge-recursive.c | 3 --- builtin/merge-tree.c | 1 - builtin/merge.c | 4 ---- builtin/mv.c | 1 - builtin/notes.c | 2 -- builtin/pack-objects.c | 3 --- builtin/pull.c | 5 ----- builtin/push.c | 1 - builtin/range-diff.c | 1 - builtin/read-tree.c | 2 -- builtin/rebase.c | 4 ---- builtin/receive-pack.c | 1 - builtin/repack.c | 1 - builtin/rerere.c | 1 - builtin/reset.c | 3 --- builtin/rev-list.c | 1 - builtin/revert.c | 2 -- builtin/rm.c | 1 - builtin/send-pack.c | 4 ---- builtin/show-ref.c | 1 - builtin/sparse-checkout.c | 4 ---- builtin/stash.c | 1 - builtin/submodule--helper.c | 1 - builtin/tag.c | 1 - builtin/unpack-objects.c | 4 ---- builtin/update-ref.c | 1 - builtin/verify-commit.c | 2 -- builtin/verify-tag.c | 1 - bulk-checkin.c | 1 - bundle-uri.c | 1 - cache-tree.c | 1 - combine-diff.c | 1 - commit-graph.c | 1 - commit-reach.c | 1 - commit.c | 2 -- config.c | 3 --- delta-islands.c | 5 ----- diff-lib.c | 1 - diff-no-index.c | 3 --- diff.c | 2 -- diffcore-break.c | 1 - diffcore-delta.c | 1 - dir.c | 1 - entry.c | 1 - exec-cmd.c | 1 - fetch-pack.c | 2 -- fsck.c | 1 - gettext.c | 2 -- gpg-interface.c | 1 - grep.c | 1 - http-fetch.c | 1 - http-push.c | 2 -- http-walker.c | 1 - http.c | 1 - imap-send.c | 2 -- line-log.c | 2 -- line-range.c | 1 - list-objects-filter-options.c | 5 ----- list-objects-filter.c | 5 ----- ls-refs.c | 1 - merge-blobs.c | 2 -- merge-ort.c | 2 -- merge-recursive.c | 5 ----- merge.c | 3 --- negotiator/noop.c | 1 - notes.c | 2 -- object-file.c | 8 -------- object-name.c | 2 -- pack-bitmap-write.c | 3 --- pack-check.c | 1 - pack-write.c | 1 - packfile.c | 1 - parse-options.c | 2 -- patch-ids.c | 1 - protocol-caps.c | 1 - reachable.c | 1 - read-cache.c | 2 -- ref-filter.c | 2 -- reflog.c | 1 - refs/files-backend.c | 2 -- refs/packed-backend.c | 1 - refs/ref-cache.c | 1 - reftable/dump.c | 2 -- reftable/generic.c | 1 - reftable/merged.c | 1 - reftable/merged_test.c | 1 - reftable/reader.c | 1 - reftable/readwrite_test.c | 1 - reftable/refname_test.c | 1 - reftable/stack_test.c | 1 - reftable/test_framework.c | 1 - reftable/tree_test.c | 2 -- remote-curl.c | 1 - remote.c | 1 - rerere.c | 2 -- reset.c | 1 - revision.c | 2 -- run-command.c | 2 -- send-pack.c | 2 -- sequencer.c | 3 --- setup.c | 1 - shallow.c | 1 - shell.c | 1 - submodule.c | 3 --- t/helper/test-bundle-uri.c | 2 -- t/helper/test-fast-rebase.c | 1 - t/helper/test-reach.c | 2 -- t/helper/test-repository.c | 1 - t/helper/test-simple-ipc.c | 1 - t/helper/test-trace2.c | 1 - tmp-objdir.c | 1 - trace2.c | 4 ---- transport-helper.c | 2 -- transport.c | 3 --- tree.c | 3 --- upload-pack.c | 6 ------ wrapper.c | 1 - xdiff-interface.c | 2 -- 161 files changed, 297 deletions(-)
add-patch.c +0 -1
@@ -12,7 +12,6 @@#include "strvec.h" #include "pathspec.h" #include "color.h" -#include "diff.h" #include "compat/terminal.h" #include "prompt.h"
apply.c +0 -1
@@ -12,7 +12,6 @@#include "base85.h" #include "config.h" #include "object-store-ll.h" -#include "blob.h" #include "delta.h" #include "diff.h" #include "dir.h"
archive.c +0 -1
@@ -17,7 +17,6 @@#include "archive.h" #include "parse-options.h" #include "unpack-trees.h" -#include "dir.h" #include "quote.h" static char const *const archive_usage[] = {
attr.c +0 -1
@@ -17,7 +17,6 @@#include "utf8.h" #include "quote.h" #include "read-cache-ll.h" -#include "revision.h" #include "object-store-ll.h" #include "setup.h" #include "thread-utils.h"
bisect.c +0 -1
@@ -9,7 +9,6 @@#include "refs.h" #include "list-objects.h" #include "quote.h" -#include "hash-lookup.h" #include "run-command.h" #include "log-tree.h" #include "bisect.h"
blob.c +0 -1
@@ -1,6 +1,5 @@#include "git-compat-util.h" #include "blob.h" -#include "repository.h" #include "alloc.h" const char *blob_type ="blob" ;
bloom.c +0 -1
@@ -2,7 +2,6 @@#include "bloom.h" #include "diff.h" #include "diffcore.h" -#include "revision.h" #include "hashmap.h" #include "commit-graph.h" #include "commit.h"
builtin/add.c +0 -3
@@ -12,14 +12,11 @@#include "dir.h" #include "gettext.h" #include "pathspec.h" -#include "exec-cmd.h" -#include "cache-tree.h" #include "run-command.h" #include "parse-options.h" #include "path.h" #include "preload-index.h" #include "diff.h" -#include "diffcore.h" #include "read-cache.h" #include "repository.h" #include "revision.h"
builtin/am.c +0 -4
@@ -10,7 +10,6 @@#include "config.h" #include "editor.h" #include "environment.h" -#include "exec-cmd.h" #include "gettext.h" #include "hex.h" #include "parse-options.h"
@@ -24,7 +23,6 @@#include "refs.h" #include "commit.h" #include "diff.h" -#include "diffcore.h" #include "unpack-trees.h" #include "branch.h" #include "object-name.h"
@@ -35,11 +33,9 @@#include "log-tree.h" #include "notes-utils.h" #include "rerere.h" -#include "prompt.h" #include "mailinfo.h" #include "apply.h" #include "string-list.h" -#include "packfile.h" #include "pager.h" #include "path.h" #include "repository.h"
builtin/apply.c +0 -1
@@ -1,6 +1,5 @@#include "builtin.h" #include "gettext.h" -#include "parse-options.h" #include "repository.h" #include "apply.h"
builtin/bisect.c +0 -1
@@ -7,7 +7,6 @@#include "parse-options.h" #include "bisect.h" #include "refs.h" -#include "dir.h" #include "strvec.h" #include "run-command.h" #include "oid-array.h"
builtin/blame.c +0 -1
@@ -25,7 +25,6 @@#include "userdiff.h" #include "line-range.h" #include "line-log.h" -#include "dir.h" #include "progress.h" #include "object-name.h" #include "object-store-ll.h"
builtin/branch.c +0 -3
@@ -17,13 +17,10 @@#include "remote.h" #include "parse-options.h" #include "branch.h" -#include "diff.h" #include "path.h" -#include "revision.h" #include "string-list.h" #include "column.h" #include "utf8.h" -#include "wt-status.h" #include "ref-filter.h" #include "worktree.h" #include "help.h"
builtin/cat-file.c +0 -1
@@ -15,7 +15,6 @@#include "parse-options.h" #include "userdiff.h" #include "streaming.h" -#include "tree-walk.h" #include "oid-array.h" #include "packfile.h" #include "object-file.h"
builtin/checkout-index.c +0 -1
@@ -7,7 +7,6 @@#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "config.h" -#include "dir.h" #include "gettext.h" #include "lockfile.h" #include "quote.h"
builtin/checkout.c +0 -3
@@ -1,7 +1,6 @@#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "advice.h" -#include "blob.h" #include "branch.h" #include "cache-tree.h" #include "checkout.h"
@@ -27,10 +26,8 @@#include "remote.h" #include "resolve-undo.h" #include "revision.h" -#include "run-command.h" #include "setup.h" #include "submodule.h" -#include "submodule-config.h" #include "symlinks.h" #include "trace2.h" #include "tree.h"
builtin/clone.c +0 -1
@@ -19,7 +19,6 @@#include "hex.h" #include "lockfile.h" #include "parse-options.h" -#include "fetch-pack.h" #include "refs.h" #include "refspec.h" #include "object-file.h"
builtin/commit-graph.c +0 -1
@@ -1,7 +1,6 @@#include "builtin.h" #include "commit.h" #include "config.h" -#include "dir.h" #include "environment.h" #include "gettext.h" #include "hex.h"
builtin/commit-tree.c +0 -3
@@ -11,9 +11,6 @@#include "object-store-ll.h" #include "repository.h" #include "commit.h" -#include "tree.h" -#include "utf8.h" -#include "gpg-interface.h" #include "parse-options.h" static const char *const commit_tree_usage[] = {
builtin/commit.c +0 -8
@@ -16,17 +16,12 @@#include "editor.h" #include "environment.h" #include "diff.h" -#include "diffcore.h" #include "commit.h" #include "gettext.h" #include "revision.h" #include "wt-status.h" #include "run-command.h" -#include "hook.h" -#include "refs.h" -#include "log-tree.h" #include "strbuf.h" -#include "utf8.h" #include "object-name.h" #include "parse-options.h" #include "path.h"
@@ -35,9 +30,6 @@#include "string-list.h" #include "rerere.h" #include "unpack-trees.h" -#include "quote.h" -#include "submodule.h" -#include "gpg-interface.h" #include "column.h" #include "sequencer.h" #include "sparse-index.h"
builtin/credential-cache.c +0 -2
@@ -7,8 +7,6 @@#ifndef NO_UNIX_SOCKETS -#include "credential.h" -#include "string-list.h" #include "unix-socket.h" #include "run-command.h"
builtin/describe.c +0 -2
@@ -7,9 +7,7 @@#include "lockfile.h" #include "commit.h" #include "tag.h" -#include "blob.h" #include "refs.h" -#include "exec-cmd.h" #include "object-name.h" #include "parse-options.h" #include "read-cache-ll.h"
builtin/diff-files.c +0 -1
@@ -11,7 +11,6 @@#include "preload-index.h" #include "repository.h" #include "revision.h" -#include "submodule.h" static const char diff_files_usage[] ="git diff-files [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]"
builtin/diff-index.c +0 -2
@@ -7,8 +7,6 @@#include "repository.h" #include "revision.h" #include "setup.h" -#include "sparse-index.h" -#include "submodule.h" static const char diff_cache_usage[] ="git diff-index [-m] [--cached] [--merge-base] "
builtin/diff-tree.c +0 -1
@@ -6,7 +6,6 @@#include "gettext.h" #include "hex.h" #include "log-tree.h" -#include "submodule.h" #include "read-cache-ll.h" #include "repository.h" #include "revision.h"
builtin/diff.c +0 -2
@@ -10,7 +10,6 @@#include "lockfile.h" #include "color.h" #include "commit.h" -#include "blob.h" #include "gettext.h" #include "tag.h" #include "diff.h"
@@ -21,7 +20,6 @@#include "revision.h" #include "log-tree.h" #include "setup.h" -#include "submodule.h" #include "oid-array.h" #include "tree.h"
builtin/difftool.c +0 -1
@@ -18,7 +18,6 @@#include "copy.h" #include "run-command.h" #include "environment.h" -#include "exec-cmd.h" #include "gettext.h" #include "hex.h" #include "parse-options.h"
builtin/fast-export.c +0 -1
@@ -25,7 +25,6 @@#include "quote.h" #include "remote.h" #include "blob.h" -#include "commit-slab.h" static const char *fast_export_usage[] = {N_ ("git fast-export [<rev-list-opts>]" ),
builtin/fetch.c +0 -2
@@ -26,7 +26,6 @@#include "connected.h" #include "strvec.h" #include "utf8.h" -#include "packfile.h" #include "pager.h" #include "path.h" #include "pkt-line.h"
@@ -38,7 +37,6 @@#include "shallow.h" #include "trace.h" #include "trace2.h" -#include "worktree.h" #include "bundle-uri.h" #define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000)
builtin/for-each-ref.c +0 -2
@@ -1,13 +1,11 @@#include "builtin.h" #include "config.h" #include "gettext.h" -#include "refs.h" #include "object.h" #include "parse-options.h" #include "ref-filter.h" #include "strbuf.h" #include "strvec.h" -#include "commit-reach.h" static char const *const for_each_ref_usage[] = {N_ ("git for-each-ref [<options>] [<pattern>]" ),
builtin/fsck.c +0 -2
@@ -13,10 +13,8 @@#include "tree-walk.h" #include "fsck.h" #include "parse-options.h" -#include "dir.h" #include "progress.h" #include "streaming.h" -#include "decorate.h" #include "packfile.h" #include "object-file.h" #include "object-name.h"
builtin/get-tar-commit-id.c +0 -1
@@ -4,7 +4,6 @@#include "builtin.h" #include "commit.h" #include "tar.h" -#include "quote.h" static const char builtin_get_tar_commit_id_usage[] ="git get-tar-commit-id" ;
builtin/grep.c +0 -3
@@ -9,9 +9,6 @@#include "hex.h" #include "repository.h" #include "config.h" -#include "blob.h" -#include "tree.h" -#include "commit.h" #include "tag.h" #include "tree-walk.h" #include "parse-options.h"
builtin/hash-object.c +0 -1
@@ -14,7 +14,6 @@#include "blob.h" #include "quote.h" #include "parse-options.h" -#include "exec-cmd.h" #include "setup.h" #include "strbuf.h" #include "write-or-die.h"
builtin/hook.c +0 -1
@@ -3,7 +3,6 @@#include "gettext.h" #include "hook.h" #include "parse-options.h" -#include "strbuf.h" #include "strvec.h" #define BUILTIN_HOOK_RUN_USAGE \
builtin/index-pack.c +0 -2
@@ -8,11 +8,9 @@#include "csum-file.h" #include "blob.h" #include "commit.h" -#include "tag.h" #include "tree.h" #include "progress.h" #include "fsck.h" -#include "exec-cmd.h" #include "strbuf.h" #include "streaming.h" #include "thread-utils.h"
builtin/init-db.c +0 -1
@@ -5,7 +5,6 @@*/ #include "builtin.h" #include "abspath.h" -#include "config.h" #include "environment.h" #include "gettext.h" #include "object-file.h"
builtin/log.c +0 -2
@@ -26,7 +26,6 @@#include "tag.h" #include "reflog-walk.h" #include "patch-ids.h" -#include "run-command.h" #include "shortlog.h" #include "remote.h" #include "string-list.h"
@@ -36,7 +35,6 @@#include "streaming.h" #include "version.h" #include "mailmap.h" -#include "gpg-interface.h" #include "progress.h" #include "commit-slab.h" #include "repository.h"
builtin/ls-files.c +0 -4
@@ -14,19 +14,15 @@#include "gettext.h" #include "object-name.h" #include "strbuf.h" -#include "tree.h" -#include "cache-tree.h" #include "parse-options.h" #include "resolve-undo.h" #include "string-list.h" #include "path.h" #include "pathspec.h" #include "read-cache.h" -#include "run-command.h" #include "setup.h" #include "sparse-index.h" #include "submodule.h" -#include "submodule-config.h" #include "object-store.h" #include "hex.h"
builtin/ls-remote.c +0 -1
@@ -5,7 +5,6 @@#include "pkt-line.h" #include "ref-filter.h" #include "remote.h" -#include "refs.h" #include "parse-options.h" #include "wildmatch.h"
builtin/ls-tree.c +0 -2
@@ -9,9 +9,7 @@#include "hex.h" #include "object-name.h" #include "object-store-ll.h" -#include "blob.h" #include "tree.h" -#include "commit.h" #include "path.h" #include "quote.h" #include "parse-options.h"
builtin/mailinfo.c +0 -1
@@ -6,7 +6,6 @@#include "abspath.h" #include "environment.h" #include "gettext.h" -#include "utf8.h" #include "strbuf.h" #include "mailinfo.h" #include "parse-options.h"
builtin/merge-base.c +0 -3
@@ -3,9 +3,6 @@#include "commit.h" #include "gettext.h" #include "hex.h" -#include "refs.h" -#include "diff.h" -#include "revision.h" #include "object-name.h" #include "parse-options.h" #include "repository.h"
builtin/merge-recursive.c +0 -3
@@ -1,13 +1,10 @@#include "builtin.h" #include "advice.h" -#include "commit.h" #include "gettext.h" #include "hash.h" -#include "tag.h" #include "merge-recursive.h" #include "object-name.h" #include "repository.h" -#include "xdiff-interface.h" static const char builtin_merge_recursive_usage[] ="git %s <base>... -- <head> <remote> ..." ;
builtin/merge-tree.c +0 -1
@@ -13,7 +13,6 @@#include "parse-options.h" #include "repository.h" #include "blob.h" -#include "exec-cmd.h" #include "merge-blobs.h" #include "quote.h" #include "tree.h"
builtin/merge.c +0 -4
@@ -31,8 +31,6 @@#include "unpack-trees.h" #include "cache-tree.h" #include "dir.h" -#include "utf8.h" -#include "log-tree.h" #include "color.h" #include "rerere.h" #include "help.h"
@@ -42,10 +40,8 @@#include "resolve-undo.h" #include "remote.h" #include "fmt-merge-msg.h" -#include "gpg-interface.h" #include "sequencer.h" #include "string-list.h" -#include "packfile.h" #include "tag.h" #include "alias.h" #include "branch.h"
builtin/mv.c +0 -1
@@ -15,7 +15,6 @@#include "pathspec.h" #include "lockfile.h" #include "dir.h" -#include "cache-tree.h" #include "string-list.h" #include "parse-options.h" #include "read-cache-ll.h"
builtin/notes.c +0 -2
@@ -9,7 +9,6 @@#include "builtin.h" #include "config.h" -#include "alloc.h" #include "editor.h" #include "environment.h" #include "gettext.h"
@@ -19,7 +18,6 @@#include "object-store-ll.h" #include "path.h" #include "repository.h" -#include "blob.h" #include "pretty.h" #include "refs.h" #include "exec-cmd.h"
builtin/pack-objects.c +0 -3
@@ -6,10 +6,8 @@#include "config.h" #include "attr.h" #include "object.h" -#include "blob.h" #include "commit.h" #include "tag.h" -#include "tree.h" #include "delta.h" #include "pack.h" #include "pack-revindex.h"
@@ -18,7 +16,6 @@#include "diff.h" #include "revision.h" #include "list-objects.h" -#include "list-objects-filter.h" #include "list-objects-filter-options.h" #include "pack-objects.h" #include "progress.h"
builtin/pull.c +0 -5
@@ -14,7 +14,6 @@#include "merge.h" #include "object-name.h" #include "parse-options.h" -#include "exec-cmd.h" #include "run-command.h" #include "oid-array.h" #include "remote.h"
@@ -24,15 +23,11 @@#include "rebase.h" #include "refs.h" #include "refspec.h" -#include "revision.h" #include "submodule.h" #include "submodule-config.h" -#include "tempfile.h" -#include "lockfile.h" #include "wt-status.h" #include "commit-reach.h" #include "sequencer.h" -#include "packfile.h" /** * Parses the value of --rebase. If value is a false value, returns
builtin/push.c +0 -1
@@ -7,7 +7,6 @@#include "config.h" #include "environment.h" #include "gettext.h" -#include "refs.h" #include "refspec.h" #include "run-command.h" #include "remote.h"
builtin/range-diff.c +0 -1
@@ -5,7 +5,6 @@#include "range-diff.h" #include "config.h" #include "repository.h" -#include "revision.h" static const char *const builtin_range_diff_usage[] = {N_ ("git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" ),
builtin/read-tree.c +0 -2
@@ -16,14 +16,12 @@#include "tree-walk.h" #include "cache-tree.h" #include "unpack-trees.h" -#include "dir.h" #include "parse-options.h" #include "repository.h" #include "resolve-undo.h" #include "setup.h" #include "sparse-index.h" #include "submodule.h" -#include "submodule-config.h" static int nr_trees;static int read_empty;
builtin/rebase.c +0 -4
@@ -11,14 +11,10 @@#include "gettext.h" #include "hex.h" #include "run-command.h" -#include "exec-cmd.h" #include "strvec.h" #include "dir.h" -#include "packfile.h" #include "refs.h" -#include "quote.h" #include "config.h" -#include "cache-tree.h" #include "unpack-trees.h" #include "lockfile.h" #include "object-file.h"
builtin/receive-pack.c +0 -1
@@ -22,7 +22,6 @@#include "connected.h" #include "strvec.h" #include "version.h" -#include "tag.h" #include "gpg-interface.h" #include "sigchain.h" #include "fsck.h"
builtin/repack.c +0 -1
@@ -8,7 +8,6 @@#include "path.h" #include "run-command.h" #include "server-info.h" -#include "sigchain.h" #include "strbuf.h" #include "string-list.h" #include "strvec.h"
builtin/rerere.c +0 -1
@@ -1,6 +1,5 @@#include "builtin.h" #include "config.h" -#include "dir.h" #include "gettext.h" #include "parse-options.h" #include "repository.h"
builtin/reset.c +0 -3
@@ -16,10 +16,8 @@#include "hash.h" #include "hex.h" #include "lockfile.h" -#include "tag.h" #include "object.h" #include "pretty.h" -#include "run-command.h" #include "refs.h" #include "diff.h" #include "diffcore.h"
@@ -33,7 +31,6 @@#include "setup.h" #include "sparse-index.h" #include "submodule.h" -#include "submodule-config.h" #include "trace.h" #include "trace2.h" #include "dir.h"
builtin/rev-list.c +0 -1
@@ -7,7 +7,6 @@#include "hex.h" #include "revision.h" #include "list-objects.h" -#include "list-objects-filter.h" #include "list-objects-filter-options.h" #include "object.h" #include "object-name.h"
builtin/revert.c +0 -2
@@ -1,5 +1,4 @@#include "git-compat-util.h" -#include "config.h" #include "builtin.h" #include "parse-options.h" #include "diff.h"
@@ -7,7 +6,6 @@#include "repository.h" #include "revision.h" #include "rerere.h" -#include "dir.h" #include "sequencer.h" #include "branch.h"
builtin/rm.c +0 -1
@@ -9,7 +9,6 @@#include "config.h" #include "lockfile.h" #include "dir.h" -#include "cache-tree.h" #include "gettext.h" #include "hash.h" #include "tree-walk.h"
builtin/send-pack.c +0 -4
@@ -1,8 +1,6 @@#include "builtin.h" #include "config.h" -#include "commit.h" #include "hex.h" -#include "refs.h" #include "pkt-line.h" #include "sideband.h" #include "run-command.h"
@@ -11,9 +9,7 @@#include "send-pack.h" #include "quote.h" #include "transport.h" -#include "version.h" #include "oid-array.h" -#include "gpg-interface.h" #include "gettext.h" #include "protocol.h" #include "parse-options.h"
builtin/show-ref.c +0 -1
@@ -6,7 +6,6 @@#include "object-name.h" #include "object-store-ll.h" #include "object.h" -#include "tag.h" #include "string-list.h" #include "parse-options.h"
builtin/sparse-checkout.c +0 -4
@@ -8,14 +8,10 @@#include "parse-options.h" #include "pathspec.h" #include "repository.h" -#include "run-command.h" #include "strbuf.h" #include "string-list.h" -#include "cache-tree.h" #include "lockfile.h" -#include "resolve-undo.h" #include "unpack-trees.h" -#include "wt-status.h" #include "quote.h" #include "setup.h" #include "sparse-index.h"
builtin/stash.c +0 -1
@@ -26,7 +26,6 @@#include "sparse-index.h" #include "log-tree.h" #include "diffcore.h" -#include "exec-cmd.h" #include "reflog.h" #include "add-interactive.h"
builtin/submodule--helper.c +0 -1
@@ -22,7 +22,6 @@#include "remote.h" #include "refs.h" #include "refspec.h" -#include "connect.h" #include "revision.h" #include "diffcore.h" #include "diff.h"
builtin/tag.c +0 -1
@@ -18,7 +18,6 @@#include "object-store-ll.h" #include "path.h" #include "tag.h" -#include "run-command.h" #include "parse-options.h" #include "diff.h" #include "revision.h"
builtin/unpack-objects.c +0 -4
@@ -10,12 +10,8 @@#include "delta.h" #include "pack.h" #include "blob.h" -#include "commit.h" #include "replace-object.h" #include "strbuf.h" -#include "tag.h" -#include "tree.h" -#include "tree-walk.h" #include "progress.h" #include "decorate.h" #include "fsck.h"
builtin/update-ref.c +0 -1
@@ -7,7 +7,6 @@#include "parse-options.h" #include "quote.h" #include "repository.h" -#include "strvec.h" static const char *const git_update_ref_usage[] = {N_ ("git update-ref [<options>] -d <refname> [<old-val>]" ),
builtin/verify-commit.c +0 -2
@@ -9,10 +9,8 @@#include "config.h" #include "gettext.h" #include "object-name.h" -#include "object-store-ll.h" #include "repository.h" #include "commit.h" -#include "run-command.h" #include "parse-options.h" #include "gpg-interface.h"
builtin/verify-tag.c +0 -1
@@ -9,7 +9,6 @@#include "config.h" #include "gettext.h" #include "tag.h" -#include "run-command.h" #include "object-name.h" #include "parse-options.h" #include "gpg-interface.h"
bulk-checkin.c +0 -1
@@ -11,7 +11,6 @@#include "csum-file.h" #include "pack.h" #include "strbuf.h" -#include "string-list.h" #include "tmp-objdir.h" #include "packfile.h" #include "object-file.h"
bundle-uri.c +0 -1
@@ -4,7 +4,6 @@#include "copy.h" #include "environment.h" #include "gettext.h" -#include "object-store-ll.h" #include "refs.h" #include "run-command.h" #include "hashmap.h"
cache-tree.c +0 -1
@@ -11,7 +11,6 @@#include "read-cache-ll.h" #include "replace-object.h" #include "promisor-remote.h" -#include "sparse-index.h" #include "trace.h" #include "trace2.h"
combine-diff.c +0 -1
@@ -2,7 +2,6 @@#include "object-store-ll.h" #include "commit.h" #include "convert.h" -#include "blob.h" #include "diff.h" #include "diffcore.h" #include "environment.h"
commit-graph.c +0 -1
@@ -8,7 +8,6 @@#include "commit.h" #include "object.h" #include "refs.h" -#include "revision.h" #include "hash-lookup.h" #include "commit-graph.h" #include "object-file.h"
commit-reach.c +0 -1
@@ -4,7 +4,6 @@#include "decorate.h" #include "hex.h" #include "prio-queue.h" -#include "tree.h" #include "ref-filter.h" #include "revision.h" #include "tag.h"
commit.c +0 -2
@@ -8,7 +8,6 @@#include "repository.h" #include "object-name.h" #include "object-store-ll.h" -#include "pkt-line.h" #include "utf8.h" #include "diff.h" #include "revision.h"
@@ -23,7 +22,6 @@#include "advice.h" #include "refs.h" #include "commit-reach.h" -#include "run-command.h" #include "setup.h" #include "shallow.h" #include "tree.h"
config.c +0 -3
@@ -30,15 +30,12 @@#include "pager.h" #include "path.h" #include "utf8.h" -#include "dir.h" #include "color.h" -#include "replace-object.h" #include "refs.h" #include "setup.h" #include "strvec.h" #include "trace2.h" #include "wildmatch.h" -#include "worktree.h" #include "ws.h" #include "write-or-die.h"
delta-islands.c +0 -5
@@ -1,18 +1,13 @@#include "git-compat-util.h" -#include "attr.h" #include "object.h" -#include "blob.h" #include "commit.h" #include "gettext.h" #include "hex.h" #include "tag.h" #include "tree.h" -#include "delta.h" #include "pack.h" #include "tree-walk.h" #include "diff.h" -#include "revision.h" -#include "list-objects.h" #include "progress.h" #include "refs.h" #include "khash.h"
diff-lib.c +0 -1
@@ -2,7 +2,6 @@* Copyright (C) 2005 Junio C Hamano */ #include "git-compat-util.h" -#include "quote.h" #include "commit.h" #include "diff.h" #include "diffcore.h"
diff-no-index.c +0 -3
@@ -8,13 +8,10 @@#include "abspath.h" #include "color.h" #include "commit.h" -#include "blob.h" -#include "tag.h" #include "diff.h" #include "diffcore.h" #include "gettext.h" #include "revision.h" -#include "log-tree.h" #include "parse-options.h" #include "string-list.h" #include "dir.h"
diff.c +0 -2
@@ -16,12 +16,10 @@#include "hex.h" #include "xdiff-interface.h" #include "color.h" -#include "attr.h" #include "run-command.h" #include "utf8.h" #include "object-store-ll.h" #include "userdiff.h" -#include "submodule-config.h" #include "submodule.h" #include "hashmap.h" #include "mem-pool.h"
diffcore-break.c +0 -1
@@ -2,7 +2,6 @@* Copyright (C) 2005 Junio C Hamano */ #include "git-compat-util.h" -#include "diff.h" #include "diffcore.h" #include "hash.h" #include "object.h"
diffcore-delta.c +0 -1
@@ -1,5 +1,4 @@#include "git-compat-util.h" -#include "diff.h" #include "diffcore.h" /*
dir.c +0 -1
@@ -16,7 +16,6 @@#include "object-file.h" #include "object-store-ll.h" #include "path.h" -#include "attr.h" #include "refs.h" #include "wildmatch.h" #include "pathspec.h"
entry.c +0 -1
@@ -1,5 +1,4 @@#include "git-compat-util.h" -#include "blob.h" #include "object-store-ll.h" #include "dir.h" #include "environment.h"
exec-cmd.c +0 -1
@@ -4,7 +4,6 @@#include "exec-cmd.h" #include "gettext.h" #include "path.h" -#include "quote.h" #include "run-command.h" #include "strvec.h" #include "trace.h"
fetch-pack.c +0 -2
@@ -10,7 +10,6 @@#include "pkt-line.h" #include "commit.h" #include "tag.h" -#include "exec-cmd.h" #include "pack.h" #include "sideband.h" #include "fetch-pack.h"
@@ -18,7 +17,6 @@#include "run-command.h" #include "connect.h" #include "trace2.h" -#include "transport.h" #include "version.h" #include "oid-array.h" #include "oidset.h"
fsck.c +0 -1
@@ -16,7 +16,6 @@#include "refs.h" #include "url.h" #include "utf8.h" -#include "decorate.h" #include "oidset.h" #include "packfile.h" #include "submodule-config.h"
gettext.c +0 -2
@@ -7,9 +7,7 @@#include "environment.h" #include "exec-cmd.h" #include "gettext.h" -#include "strbuf.h" #include "utf8.h" -#include "config.h" #ifndef NO_GETTEXT # include <libintl.h>
gpg-interface.c +0 -1
@@ -12,7 +12,6 @@#include "sigchain.h" #include "tempfile.h" #include "alias.h" -#include "environment.h" static int git_gpg_config (const char *,const char *,const struct config_context *,void *);
grep.c +0 -1
@@ -9,7 +9,6 @@#include "xdiff-interface.h" #include "diff.h" #include "diffcore.h" -#include "commit.h" #include "quote.h" #include "help.h"
http-fetch.c +0 -1
@@ -1,6 +1,5 @@#include "git-compat-util.h" #include "config.h" -#include "exec-cmd.h" #include "gettext.h" #include "hex.h" #include "http.h"
http-push.c +0 -2
@@ -6,10 +6,8 @@#include "tag.h" #include "blob.h" #include "http.h" -#include "refs.h" #include "diff.h" #include "revision.h" -#include "exec-cmd.h" #include "remote.h" #include "list-objects.h" #include "setup.h"
http-walker.c +0 -1
@@ -1,6 +1,5 @@#include "git-compat-util.h" #include "repository.h" -#include "commit.h" #include "hex.h" #include "walker.h" #include "http.h"
http.c +0 -1
@@ -15,7 +15,6 @@#include "trace.h" #include "transport.h" #include "packfile.h" -#include "protocol.h" #include "string-list.h" #include "object-file.h" #include "object-store-ll.h"
imap-send.c +0 -2
@@ -24,12 +24,10 @@#include "git-compat-util.h" #include "config.h" #include "credential.h" -#include "exec-cmd.h" #include "gettext.h" #include "run-command.h" #include "parse-options.h" #include "setup.h" -#include "strbuf.h" #if defined(NO_OPENSSL ) && !defined(HAVE_OPENSSL_CSPRNG )typedef void *SSL ;#endif
line-log.c +0 -2
@@ -2,7 +2,6 @@#include "line-range.h" #include "hex.h" #include "tag.h" -#include "blob.h" #include "tree.h" #include "diff.h" #include "commit.h"
@@ -12,7 +11,6 @@#include "xdiff-interface.h" #include "strbuf.h" #include "log-tree.h" -#include "graph.h" #include "userdiff.h" #include "line-log.h" #include "setup.h"
line-range.c +0 -1
@@ -1,7 +1,6 @@#include "git-compat-util.h" #include "line-range.h" #include "xdiff-interface.h" -#include "strbuf.h" #include "userdiff.h" /*
list-objects-filter-options.c +0 -5
@@ -1,11 +1,6 @@#include "git-compat-util.h" -#include "commit.h" #include "config.h" #include "gettext.h" -#include "revision.h" -#include "strvec.h" -#include "list-objects.h" -#include "list-objects-filter.h" #include "list-objects-filter-options.h" #include "promisor-remote.h" #include "trace.h"
list-objects-filter.c +0 -5
@@ -2,14 +2,9 @@#include "dir.h" #include "gettext.h" #include "hex.h" -#include "tag.h" #include "commit.h" -#include "tree.h" -#include "blob.h" #include "diff.h" -#include "tree-walk.h" #include "revision.h" -#include "list-objects.h" #include "list-objects-filter.h" #include "list-objects-filter-options.h" #include "oidmap.h"
ls-refs.c +0 -1
@@ -5,7 +5,6 @@#include "hex.h" #include "repository.h" #include "refs.h" -#include "remote.h" #include "strvec.h" #include "ls-refs.h" #include "pkt-line.h"
merge-blobs.c +0 -2
@@ -1,6 +1,4 @@#include "git-compat-util.h" -#include "run-command.h" -#include "xdiff-interface.h" #include "merge-ll.h" #include "blob.h" #include "merge-blobs.h"
merge-ort.c +0 -2
@@ -19,7 +19,6 @@#include "alloc.h" #include "attr.h" -#include "blob.h" #include "cache-tree.h" #include "commit.h" #include "commit-reach.h"
@@ -42,7 +41,6 @@#include "revision.h" #include "sparse-index.h" #include "strmap.h" -#include "submodule-config.h" #include "submodule.h" #include "trace2.h" #include "tree.h"
merge-recursive.c +0 -5
@@ -6,10 +6,7 @@#include "git-compat-util.h" #include "merge-recursive.h" -#include "advice.h" #include "alloc.h" -#include "attr.h" -#include "blob.h" #include "cache-tree.h" #include "commit.h" #include "commit-reach.h"
@@ -32,8 +29,6 @@#include "revision.h" #include "sparse-index.h" #include "string-list.h" -#include "submodule-config.h" -#include "submodule.h" #include "symlinks.h" #include "tag.h" #include "tree-walk.h"
merge.c +0 -3
@@ -1,6 +1,4 @@#include "git-compat-util.h" -#include "diff.h" -#include "diffcore.h" #include "gettext.h" #include "hash.h" #include "hex.h"
@@ -13,7 +11,6 @@#include "tree.h" #include "tree-walk.h" #include "unpack-trees.h" -#include "dir.h" static const char *merge_argument (struct commit *commit) {
negotiator/noop.c +0 -1
@@ -1,6 +1,5 @@#include "git-compat-util.h" #include "noop.h" -#include "../commit.h" #include "../fetch-negotiator.h" static void known_common(struct fetch_negotiator *n UNUSED,
notes.c +0 -2
@@ -5,8 +5,6 @@#include "notes.h" #include "object-name.h" #include "object-store-ll.h" -#include "blob.h" -#include "tree.h" #include "utf8.h" #include "strbuf.h" #include "tree-walk.h"
object-file.c +0 -8
@@ -15,24 +15,16 @@#include "hex.h" #include "string-list.h" #include "lockfile.h" -#include "delta.h" #include "pack.h" -#include "blob.h" #include "commit.h" #include "run-command.h" -#include "tag.h" -#include "tree.h" -#include "tree-walk.h" #include "refs.h" -#include "pack-revindex.h" -#include "hash-lookup.h" #include "bulk-checkin.h" #include "repository.h" #include "replace-object.h" #include "streaming.h" #include "dir.h" #include "list.h" -#include "mergesort.h" #include "quote.h" #include "packfile.h" #include "object-file.h"
object-name.c +0 -2
@@ -8,7 +8,6 @@#include "tag.h" #include "commit.h" #include "tree.h" -#include "blob.h" #include "tree-walk.h" #include "refs.h" #include "remote.h"
@@ -21,7 +20,6 @@#include "read-cache-ll.h" #include "repository.h" #include "setup.h" -#include "submodule.h" #include "midx.h" #include "commit-reach.h" #include "date.h"
pack-bitmap-write.c +0 -3
@@ -4,12 +4,9 @@#include "hex.h" #include "object-store-ll.h" #include "commit.h" -#include "tag.h" #include "diff.h" #include "revision.h" -#include "list-objects.h" #include "progress.h" -#include "pack-revindex.h" #include "pack.h" #include "pack-bitmap.h" #include "hash-lookup.h"
pack-check.c +0 -1
@@ -3,7 +3,6 @@#include "hex.h" #include "repository.h" #include "pack.h" -#include "pack-revindex.h" #include "progress.h" #include "packfile.h" #include "object-file.h"
pack-write.c +0 -1
@@ -7,7 +7,6 @@#include "remote.h" #include "chunk-format.h" #include "pack-mtimes.h" -#include "oidmap.h" #include "pack-objects.h" #include "pack-revindex.h" #include "path.h"
packfile.c +0 -1
@@ -9,7 +9,6 @@#include "mergesort.h" #include "packfile.h" #include "delta.h" -#include "streaming.h" #include "hash-lookup.h" #include "commit.h" #include "object.h"
parse-options.c +0 -2
@@ -2,8 +2,6 @@#include "parse-options.h" #include "abspath.h" #include "parse.h" -#include "commit.h" -#include "color.h" #include "gettext.h" #include "strbuf.h" #include "string-list.h"
patch-ids.c +0 -1
@@ -2,7 +2,6 @@#include "diff.h" #include "commit.h" #include "hash.h" -#include "hash-lookup.h" #include "hex.h" #include "patch-ids.h"
protocol-caps.c +0 -1
@@ -3,7 +3,6 @@#include "gettext.h" #include "hex.h" #include "pkt-line.h" -#include "strvec.h" #include "hash-ll.h" #include "hex.h" #include "object.h"
reachable.c +0 -1
@@ -2,7 +2,6 @@#include "gettext.h" #include "hex.h" #include "refs.h" -#include "tag.h" #include "commit.h" #include "blob.h" #include "diff.h"
read-cache.c +0 -2
@@ -20,7 +20,6 @@#include "oid-array.h" #include "tree.h" #include "commit.h" -#include "blob.h" #include "environment.h" #include "gettext.h" #include "mem-pool.h"
@@ -31,7 +30,6 @@#include "read-cache.h" #include "resolve-undo.h" #include "revision.h" -#include "run-command.h" #include "strbuf.h" #include "trace2.h" #include "varint.h"
ref-filter.c +0 -2
@@ -22,12 +22,10 @@#include "ref-filter.h" #include "revision.h" #include "utf8.h" -#include "version.h" #include "versioncmp.h" #include "trailer.h" #include "wt-status.h" #include "commit-slab.h" -#include "commit-graph.h" #include "commit-reach.h" #include "worktree.h" #include "hashmap.h"
reflog.c +0 -1
@@ -6,7 +6,6 @@#include "revision.h" #include "tree.h" #include "tree-walk.h" -#include "worktree.h" /* Remember to update object flag allocation in object.h */ #define INCOMPLETE (1u<<10)
refs/files-backend.c +0 -2
@@ -1,5 +1,4 @@#include "../git-compat-util.h" -#include "../config.h" #include "../copy.h" #include "../environment.h" #include "../gettext.h"
@@ -19,7 +18,6 @@#include "../dir.h" #include "../chdir-notify.h" #include "../setup.h" -#include "../worktree.h" #include "../wrapper.h" #include "../write-or-die.h" #include "../revision.h"
refs/packed-backend.c +0 -1
@@ -1,5 +1,4 @@#include "../git-compat-util.h" -#include "../alloc.h" #include "../config.h" #include "../gettext.h" #include "../hash.h"
refs/ref-cache.c +0 -1
@@ -1,5 +1,4 @@#include "../git-compat-util.h" -#include "../alloc.h" #include "../hash.h" #include "../refs.h" #include "../repository.h"
reftable/dump.c +0 -2
@@ -11,14 +11,12 @@ https://developers.google.com/open-source/licenses/bsd#include "reftable-blocksource.h" #include "reftable-error.h" -#include "reftable-merged.h" #include "reftable-record.h" #include "reftable-tests.h" #include "reftable-writer.h" #include "reftable-iterator.h" #include "reftable-reader.h" #include "reftable-stack.h" -#include "reftable-generic.h" #include <stddef.h> #include <stdio.h>
reftable/generic.c +0 -1
@@ -6,7 +6,6 @@ license that can be found in the LICENSE file or athttps://developers.google.com/open-source/licenses/bsd */ -#include "basics.h" #include "constants.h" #include "record.h" #include "generic.h"
reftable/merged.c +0 -1
@@ -11,7 +11,6 @@ https://developers.google.com/open-source/licenses/bsd#include "constants.h" #include "iter.h" #include "pq.h" -#include "reader.h" #include "record.h" #include "generic.h" #include "reftable-merged.h"
reftable/merged_test.c +0 -1
@@ -12,7 +12,6 @@ https://developers.google.com/open-source/licenses/bsd#include "basics.h" #include "blocksource.h" -#include "constants.h" #include "reader.h" #include "record.h" #include "test_framework.h"
reftable/reader.c +0 -1
@@ -16,7 +16,6 @@ https://developers.google.com/open-source/licenses/bsd#include "record.h" #include "reftable-error.h" #include "reftable-generic.h" -#include "tree.h" uint64_t block_source_size (struct reftable_block_source *source) {
reftable/readwrite_test.c +0 -1
@@ -11,7 +11,6 @@ https://developers.google.com/open-source/licenses/bsd#include "basics.h" #include "block.h" #include "blocksource.h" -#include "constants.h" #include "reader.h" #include "record.h" #include "test_framework.h"
reftable/refname_test.c +0 -1
@@ -9,7 +9,6 @@ https://developers.google.com/open-source/licenses/bsd#include "basics.h" #include "block.h" #include "blocksource.h" -#include "constants.h" #include "reader.h" #include "record.h" #include "refname.h"
reftable/stack_test.c +0 -1
@@ -13,7 +13,6 @@ https://developers.google.com/open-source/licenses/bsd#include "reftable-reader.h" #include "merged.h" #include "basics.h" -#include "constants.h" #include "record.h" #include "test_framework.h" #include "reftable-tests.h"
reftable/test_framework.c +0 -1
@@ -9,7 +9,6 @@ https://developers.google.com/open-source/licenses/bsd#include "system.h" #include "test_framework.h" -#include "basics.h" void set_test_hash (uint8_t *p,int i) {
reftable/tree_test.c +0 -2
@@ -9,8 +9,6 @@ https://developers.google.com/open-source/licenses/bsd#include "system.h" #include "tree.h" -#include "basics.h" -#include "record.h" #include "test_framework.h" #include "reftable-tests.h"
remote-curl.c +0 -1
@@ -8,7 +8,6 @@#include "strbuf.h" #include "walker.h" #include "http.h" -#include "exec-cmd.h" #include "run-command.h" #include "pkt-line.h" #include "string-list.h"
remote.c +0 -1
@@ -15,7 +15,6 @@#include "diff.h" #include "revision.h" #include "dir.h" -#include "tag.h" #include "setup.h" #include "string-list.h" #include "strvec.h"
rerere.c +0 -2
@@ -12,12 +12,10 @@#include "dir.h" #include "resolve-undo.h" #include "merge-ll.h" -#include "attr.h" #include "path.h" #include "pathspec.h" #include "object-file.h" #include "object-store-ll.h" -#include "hash-lookup.h" #include "strmap.h" #define RESOLVED 0
reset.c +0 -1
@@ -6,7 +6,6 @@#include "object-name.h" #include "refs.h" #include "reset.h" -#include "run-command.h" #include "tree-walk.h" #include "tree.h" #include "unpack-trees.h"
revision.c +0 -2
@@ -21,12 +21,10 @@#include "reflog-walk.h" #include "patch-ids.h" #include "decorate.h" -#include "log-tree.h" #include "string-list.h" #include "line-log.h" #include "mailmap.h" #include "commit-slab.h" -#include "dir.h" #include "cache-tree.h" #include "bisect.h" #include "packfile.h"
run-command.c +0 -2
@@ -14,9 +14,7 @@#include "quote.h" #include "config.h" #include "packfile.h" -#include "hook.h" #include "compat/nonblock.h" -#include "alloc.h" void child_process_init (struct child_process *child) {
send-pack.c +0 -2
@@ -4,7 +4,6 @@#include "date.h" #include "gettext.h" #include "hex.h" -#include "refs.h" #include "object-store-ll.h" #include "pkt-line.h" #include "sideband.h"
@@ -12,7 +11,6 @@#include "remote.h" #include "connect.h" #include "send-pack.h" -#include "quote.h" #include "transport.h" #include "version.h" #include "oid-array.h"
sequencer.c +0 -3
@@ -15,10 +15,8 @@#include "pager.h" #include "commit.h" #include "sequencer.h" -#include "tag.h" #include "run-command.h" #include "hook.h" -#include "exec-cmd.h" #include "utf8.h" #include "cache-tree.h" #include "diff.h"
@@ -39,7 +37,6 @@#include "notes-utils.h" #include "sigchain.h" #include "unpack-trees.h" -#include "worktree.h" #include "oidmap.h" #include "oidset.h" #include "commit-slab.h"
setup.c +0 -1
@@ -13,7 +13,6 @@#include "string-list.h" #include "chdir-notify.h" #include "path.h" -#include "promisor-remote.h" #include "quote.h" #include "trace2.h" #include "worktree.h"
shallow.c +0 -1
@@ -7,7 +7,6 @@#include "commit.h" #include "tag.h" #include "pkt-line.h" -#include "remote.h" #include "refs.h" #include "oid-array.h" #include "path.h"
shell.c +0 -1
@@ -4,7 +4,6 @@#include "strbuf.h" #include "run-command.h" #include "alias.h" -#include "prompt.h" #define COMMAND_DIR "git-shell-commands"#define HELP_COMMAND COMMAND_DIR "/help"
submodule.c +0 -3
@@ -17,10 +17,8 @@#include "string-list.h" #include "oid-array.h" #include "strvec.h" -#include "blob.h" #include "thread-utils.h" #include "path.h" -#include "quote.h" #include "remote.h" #include "worktree.h" #include "parse-options.h"
@@ -30,7 +28,6 @@#include "commit-reach.h" #include "read-cache-ll.h" #include "setup.h" -#include "shallow.h" #include "trace2.h" static int config_update_recurse_submodules =RECURSE_SUBMODULES_OFF ;
t/helper/test-bundle-uri.c +0 -2
@@ -5,9 +5,7 @@#include "strbuf.h" #include "string-list.h" #include "transport.h" -#include "ref-filter.h" #include "remote.h" -#include "refs.h" enum input_mode {KEY_VALUE_PAIRS ,
t/helper/test-fast-rebase.c +0 -1
@@ -24,7 +24,6 @@#include "read-cache-ll.h" #include "refs.h" #include "revision.h" -#include "sequencer.h" #include "setup.h" #include "strvec.h" #include "tree.h"
t/helper/test-reach.c +0 -2
@@ -1,11 +1,9 @@#include "test-tool.h" #include "commit.h" #include "commit-reach.h" -#include "config.h" #include "gettext.h" #include "hex.h" #include "object-name.h" -#include "parse-options.h" #include "ref-filter.h" #include "setup.h" #include "string-list.h"
t/helper/test-repository.c +0 -1
@@ -1,7 +1,6 @@#include "test-tool.h" #include "commit-graph.h" #include "commit.h" -#include "config.h" #include "environment.h" #include "hex.h" #include "object-store-ll.h"
t/helper/test-simple-ipc.c +0 -1
@@ -4,7 +4,6 @@#include "test-tool.h" #include "gettext.h" -#include "strbuf.h" #include "simple-ipc.h" #include "parse-options.h" #include "thread-utils.h"
t/helper/test-trace2.c +0 -1
@@ -2,7 +2,6 @@#include "strvec.h" #include "run-command.h" #include "exec-cmd.h" -#include "config.h" #include "repository.h" #include "trace2.h"
tmp-objdir.c +0 -1
@@ -6,7 +6,6 @@#include "environment.h" #include "object-file.h" #include "path.h" -#include "sigchain.h" #include "string-list.h" #include "strbuf.h" #include "strvec.h"
trace2.c +0 -4
@@ -1,12 +1,8 @@#include "git-compat-util.h" -#include "config.h" -#include "json-writer.h" -#include "quote.h" #include "repository.h" #include "run-command.h" #include "sigchain.h" #include "thread-utils.h" -#include "version.h" #include "trace.h" #include "trace2.h" #include "trace2/tr2_cfg.h"
transport-helper.c +0 -2
@@ -3,13 +3,11 @@#include "quote.h" #include "run-command.h" #include "commit.h" -#include "diff.h" #include "environment.h" #include "gettext.h" #include "hex.h" #include "object-name.h" #include "repository.h" -#include "revision.h" #include "remote.h" #include "string-list.h" #include "thread-utils.h"
transport.c +0 -3
@@ -10,9 +10,7 @@#include "remote.h" #include "connect.h" #include "send-pack.h" -#include "walker.h" #include "bundle.h" -#include "dir.h" #include "gettext.h" #include "refs.h" #include "refspec.h"
@@ -26,7 +24,6 @@#include "transport-internal.h" #include "protocol.h" #include "object-name.h" -#include "object-store-ll.h" #include "color.h" #include "bundle-uri.h"
tree.c +0 -3
@@ -1,12 +1,9 @@#include "git-compat-util.h" -#include "cache-tree.h" #include "hex.h" #include "tree.h" #include "object-name.h" #include "object-store-ll.h" -#include "blob.h" #include "commit.h" -#include "tag.h" #include "alloc.h" #include "tree-walk.h" #include "repository.h"
upload-pack.c +0 -6
@@ -9,13 +9,10 @@#include "repository.h" #include "object-store-ll.h" #include "oid-array.h" -#include "tag.h" #include "object.h" #include "commit.h" #include "diff.h" #include "revision.h" -#include "list-objects.h" -#include "list-objects-filter.h" #include "list-objects-filter-options.h" #include "run-command.h" #include "connect.h"
@@ -24,11 +21,8 @@#include "string-list.h" #include "strvec.h" #include "trace2.h" -#include "prio-queue.h" #include "protocol.h" -#include "quote.h" #include "upload-pack.h" -#include "serve.h" #include "commit-graph.h" #include "commit-reach.h" #include "shallow.h"
wrapper.c +0 -1
@@ -5,7 +5,6 @@#include "abspath.h" #include "parse.h" #include "gettext.h" -#include "repository.h" #include "strbuf.h" #include "trace2.h"
xdiff-interface.c +0 -2
@@ -6,8 +6,6 @@#include "xdiff-interface.h" #include "xdiff/xtypes.h" #include "xdiff/xdiffi.h" -#include "xdiff/xemit.h" -#include "xdiff/xmacros.h" #include "xdiff/xutils.h" struct xdiff_emit_state {
Signature · 1 line
gitgitgadget
Re: [PATCH 02/12] treewide: remove unnecessary includes in source files
Quoted 7 lines · Elijah Newren via GitGitGadget
trace2.c +0
-1@@ -1,12 +1,8 @@#include "git-compat-util.h" -#include "config.h"
trace2.c line 8
Quoted 10 lines
trace2.c +0
-3-#include "json-writer.h" -#include "quote.h" #include "repository.h" #include "run-command.h" #include "sigchain.h" #include "thread-utils.h" -#include "version.h" #include "trace.h" #include "trace2.h" #include "trace2/tr2_cfg.h"
An in-flight topic seem to want to see git_env_bool() that is declared in parse.h that is pulled in via inclusion of config.h hence this hunk breaks 'seen'.
t/helper/test-trace2.c line 6
Quoted 11 lines
t/helper/test-trace2.c +0
-1@@ -2,7 +2,6 @@#include "strvec.h" #include "run-command.h" #include "exec-cmd.h" -#include "config.h" #include "repository.h" #include "trace2.h"
An in-flight topic starts using "struct key_value_info" that is available via the inclusion of "config.h", hence this hunk breaks the build of 'seen'.
t/helper/test-fast-rebase.c line 29
Quoted 12 lines
t/helper/test-fast-rebase.c +0
-1@@ -24,7 +24,6 @@#include "read-cache-ll.h" #include "refs.h" #include "revision.h" -#include "sequencer.h" #include "setup.h" #include "strvec.h" #include "tree.h"
I'll register the following evil merge as the merge-fix/ for this topic.
In addition, t/helper/test-fast-rebase.c that is touched by this step will simply disappear with the cc/git-replay topic, so it may not be a bad idea to exclude it from the patchset.
Thanks.
t/helper/test-trace2.c +1 -0
@@ -1,4 +1,5 @@#include "test-tool.h" +#include "config-parse.h" #include "strvec.h" #include "run-command.h" #include "exec-cmd.h"
trace2.c +1 -0
@@ -1,4 +1,5 @@#include "git-compat-util.h" +#include "parse.h" #include "repository.h" #include "run-command.h" #include "sigchain.h"
Re: [PATCH 02/12] treewide: remove unnecessary includes in source files
Quoted 10 lines · Junio C Hamano
trace2.c
Quoted 4 lines · Elijah Newren via GitGitGadget
trace2.c +0
-1--- a/trace2.cAn in-flight topic seem to want to see
git_env_bool()that is declared inparse.hthat is pulled in via inclusion ofconfig.hhence this hunk breaks 'seen'.
Quoted 7 lines
t/helper/test-trace2.c
Quoted 4 lines
t/helper/test-trace2.c +0
-1--- a/t/helper/test-trace2.cAn in-flight topic starts using "struct
key_value_info" that is available via the inclusion of "config.h", hence this hunk breaks the build of 'seen'.
It seems that we have gained another topic in flight that gets broken by this change. I can keep piling merge-fixes on top, but it does not look like a strategy that would scale well.
Can we get this series thoroughly reviewed quickly to merge it down via 'next' to 'master' soonish, so that other topics can be rebased on the result, or is that too much to ask during the Winter lull?
Thanks.
Re: [PATCH 02/12] treewide: remove unnecessary includes in source files
Quoted 25 lines · Junio C Hamano
Quoted 10 lines · Junio C Hamano
trace2.c
Quoted 4 lines · Elijah Newren via GitGitGadget
trace2.c +0
-1--- a/trace2.cAn in-flight topic seem to want to see
git_env_bool()that is declared inparse.hthat is pulled in via inclusion ofconfig.hhence this hunk breaks 'seen'.Quoted 7 lines
t/helper/test-trace2.c
Quoted 4 lines
t/helper/test-trace2.c +0
-1--- a/t/helper/test-trace2.cAn in-flight topic starts using "struct
key_value_info" that is available via the inclusion of "config.h", hence this hunk breaks the build of 'seen'.It seems that we have gained another topic in flight that gets broken by this change. I can keep piling merge-fixes on top, but it does not look like a strategy that would scale well.
Quoted 5 lines
Can we get this series thoroughly reviewed quickly to merge it down via 'next' to 'master' soonish, so that other topics can be rebased on the result, or is that too much to ask during the Winter lull?
Thanks.
The Winter lull is my winter surge, so I can certainly quickly make whatever changes are required (well, assuming I can shake this fever...). But that doesn't help much with reviewing, since that should be done by someone other than the author. However, these particular type of changes are pretty innocuous; there's really not anything clever going on, it's just a lot of gruntwork, and does-it-compile is most of the review.
Anyway, I'll reroll, dropping or holding back any changes that conflict with next or seen, and see if that encourages anyone to chime in.
PATCH 3/12 archive.h: remove unnecessary include
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need.
Signed-off-by Elijah Newren <[email protected]>
--- archive-tar.c | 1 + archive-zip.c | 1 + archive.c | 1 + archive.h | 1 - 4 files changed, 3 insertions(+), 1 deletion(-)
archive-tar.c +1 -0
@@ -9,6 +9,7 @@#include "tar.h" #include "archive.h" #include "object-store-ll.h" +#include "strbuf.h" #include "streaming.h" #include "run-command.h" #include "write-or-die.h"
archive-zip.c +1 -0
@@ -10,6 +10,7 @@#include "streaming.h" #include "utf8.h" #include "object-store-ll.h" +#include "strbuf.h" #include "userdiff.h" #include "write-or-die.h" #include "xdiff-interface.h"
archive.c +1 -0
@@ -5,6 +5,7 @@#include "environment.h" #include "gettext.h" #include "hex.h" +#include "object-name.h" #include "path.h" #include "pretty.h" #include "setup.h"
archive.h +0 -1
@@ -1,7 +1,6 @@#ifndef ARCHIVE_H #define ARCHIVE_H -#include "object-name.h" #include "pathspec.h" #include "string-list.h"
Signature · 1 line
gitgitgadget
PATCH 4/12 blame.h: remove unnecessary includes
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need.
Signed-off-by Elijah Newren <[email protected]>
--- blame.c | 2 ++ blame.h | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-)
blame.c +2 -0
@@ -3,6 +3,7 @@#include "object-store-ll.h" #include "cache-tree.h" #include "mergesort.h" +#include "commit.h" #include "convert.h" #include "diff.h" #include "diffcore.h"
@@ -10,6 +11,7 @@#include "hex.h" #include "path.h" #include "read-cache.h" +#include "revision.h" #include "setup.h" #include "tag.h" #include "trace2.h"
blame.h +0 -3
@@ -1,12 +1,9 @@#ifndef BLAME_H #define BLAME_H -#include "commit.h" #include "oidset.h" #include "xdiff-interface.h" -#include "revision.h" #include "prio-queue.h" -#include "diff.h" #define PICKAXE_BLAME_MOVE 01#define PICKAXE_BLAME_COPY 02
Signature · 1 line
gitgitgadget
PATCH 5/12 fsmonitor--daemon.h: remove unnecessary includes
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need.
Signed-off-by Elijah Newren <[email protected]>
--- builtin/fsmonitor--daemon.c | 2 ++ compat/fsmonitor/fsm-health-win32.c | 1 + compat/fsmonitor/fsm-listen-darwin.c | 1 + compat/fsmonitor/fsm-listen-win32.c | 1 + fsmonitor--daemon.h | 4 +--- 5 files changed, 6 insertions(+), 3 deletions(-)
builtin/fsmonitor--daemon.c +2 -0
@@ -1,6 +1,7 @@#include "builtin.h" #include "abspath.h" #include "config.h" +#include "dir.h" #include "environment.h" #include "gettext.h" #include "parse-options.h"
@@ -14,6 +15,7 @@#include "simple-ipc.h" #include "khash.h" #include "pkt-line.h" +#include "run-command.h" #include "trace.h" #include "trace2.h"
compat/fsmonitor/fsm-health-win32.c +1 -0
@@ -4,6 +4,7 @@#include "fsm-health.h" #include "fsmonitor--daemon.h" #include "gettext.h" +#include "simple-ipc.h" /* * Every minute wake up and test our health.
compat/fsmonitor/fsm-listen-darwin.c +1 -0
@@ -29,6 +29,7 @@#include "fsmonitor--daemon.h" #include "fsmonitor-path-utils.h" #include "gettext.h" +#include "simple-ipc.h" #include "string-list.h" #include "trace.h"
compat/fsmonitor/fsm-listen-win32.c +1 -0
@@ -4,6 +4,7 @@#include "fsm-listen.h" #include "fsmonitor--daemon.h" #include "gettext.h" +#include "simple-ipc.h" #include "trace2.h" /*
fsmonitor--daemon.h +1 -3
@@ -3,9 +3,7 @@#ifdef HAVE_FSMONITOR_DAEMON_BACKEND -#include "dir.h" -#include "run-command.h" -#include "simple-ipc.h" +#include "hashmap.h" #include "thread-utils.h" #include "fsmonitor-path-utils.h"
Signature · 1 line
gitgitgadget
PATCH 6/12 http.h: remove unnecessary include
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need.
Signed-off-by Elijah Newren <[email protected]>
--- http-fetch.c | 1 + http-push.c | 1 + http.h | 1 - remote-curl.c | 1 + 4 files changed, 3 insertions(+), 1 deletion(-)
http-fetch.c +1 -0
@@ -6,6 +6,7 @@#include "walker.h" #include "setup.h" #include "strvec.h" +#include "url.h" #include "urlmatch.h" #include "trace2.h"
http-push.c +1 -0
@@ -15,6 +15,7 @@#include "strvec.h" #include "tree.h" #include "tree-walk.h" +#include "url.h" #include "packfile.h" #include "object-store-ll.h" #include "commit-reach.h"
http.h +0 -1
@@ -10,7 +10,6 @@ struct packed_git;#include "strbuf.h" #include "remote.h" -#include "url.h" #define DEFAULT_MAX_REQUESTS 5
remote-curl.c +1 -0
@@ -21,6 +21,7 @@#include "quote.h" #include "trace2.h" #include "transport.h" +#include "url.h" #include "write-or-die.h" static struct remote *remote;
Signature · 1 line
gitgitgadget
PATCH 7/12 line-log.h: remove unnecessary include
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need.
Signed-off-by Elijah Newren <[email protected]>
--- line-log.c | 1 + line-log.h | 2 -- log-tree.c | 1 + 3 files changed, 2 insertions(+), 2 deletions(-)
line-log.c +1 -0
@@ -1,4 +1,5 @@#include "git-compat-util.h" +#include "diffcore.h" #include "line-range.h" #include "hex.h" #include "tag.h"
line-log.h +0 -2
@@ -1,8 +1,6 @@#ifndef LINE_LOG_H #define LINE_LOG_H -#include "diffcore.h" -struct rev_info ;struct commit ;struct string_list ;
log-tree.c +1 -0
@@ -2,6 +2,7 @@#include "commit-reach.h" #include "config.h" #include "diff.h" +#include "diffcore.h" #include "environment.h" #include "hex.h" #include "object-name.h"
Signature · 1 line
gitgitgadget
PATCH 8/12 pkt-line.h: remove unnecessary include
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need.
Signed-off-by Elijah Newren <[email protected]>
--- pkt-line.c | 1 + pkt-line.h | 1 - t/helper/test-pkt-line.c | 1 + 3 files changed, 2 insertions(+), 1 deletion(-)
pkt-line.c +1 -0
@@ -4,6 +4,7 @@#include "gettext.h" #include "hex.h" #include "run-command.h" +#include "sideband.h" #include "trace.h" #include "write-or-die.h"
pkt-line.h +0 -1
@@ -2,7 +2,6 @@#define PKTLINE_H #include "strbuf.h" -#include "sideband.h" /* * Write a packetized stream, where each line is preceded by
t/helper/test-pkt-line.c +1 -0
@@ -1,6 +1,7 @@#include "git-compat-util.h" #include "test-tool.h" #include "pkt-line.h" +#include "sideband.h" #include "write-or-die.h" static void pack_line (const char *line)
Signature · 1 line
gitgitgadget
PATCH 9/12 submodule-config.h: remove unnecessary include
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need.
Signed-off-by Elijah Newren <[email protected]>
--- submodule-config.h | 1 - t/helper/test-submodule.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)
submodule-config.h +0 -1
@@ -3,7 +3,6 @@#include "config.h" #include "submodule.h" -#include "strbuf.h" #include "tree-walk.h" /**
t/helper/test-submodule.c +1 -0
@@ -4,6 +4,7 @@#include "remote.h" #include "repository.h" #include "setup.h" +#include "strbuf.h" #include "submodule-config.h" #include "submodule.h"
Signature · 1 line
gitgitgadget
PATCH 10/12 trace2/tr2_tls.h: remove unnecessary include
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need.
Signed-off-by Elijah Newren <[email protected]>
--- trace2/tr2_tgt_normal.c | 1 + trace2/tr2_tls.c | 1 + trace2/tr2_tls.h | 1 - 3 files changed, 2 insertions(+), 1 deletion(-)
trace2/tr2_tgt_normal.c +1 -0
@@ -2,6 +2,7 @@#include "config.h" #include "repository.h" #include "run-command.h" +#include "strbuf.h" #include "quote.h" #include "version.h" #include "trace2/tr2_dst.h"
trace2/tr2_tls.c +1 -0
@@ -1,4 +1,5 @@#include "git-compat-util.h" +#include "strbuf.h" #include "thread-utils.h" #include "trace.h" #include "trace2/tr2_tls.h"
trace2/tr2_tls.h +0 -1
@@ -1,7 +1,6 @@#ifndef TR2_TLS_H #define TR2_TLS_H -#include "strbuf.h" #include "trace2/tr2_ctr.h" #include "trace2/tr2_tmr.h"
Signature · 1 line
gitgitgadget
PATCH 11/12 treewide: add direct includes currently only pulled in transitively
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
The next commit will remove a bunch of unnecessary includes, but to do so, we need some of the lower level direct includes that files rely on to be explicitly specified.
Signed-off-by Elijah Newren <[email protected]>
--- builtin/commit-graph.c | 1 + builtin/for-each-ref.c | 1 + builtin/fsmonitor--daemon.c | 1 + commit-graph.c | 1 + 4 files changed, 4 insertions(+)
builtin/commit-graph.c +1 -0
@@ -11,6 +11,7 @@#include "object-store-ll.h" #include "progress.h" #include "replace-object.h" +#include "strbuf.h" #include "tag.h" #include "trace2.h"
builtin/for-each-ref.c +1 -0
@@ -1,4 +1,5 @@#include "builtin.h" +#include "commit.h" #include "config.h" #include "gettext.h" #include "object.h"
builtin/fsmonitor--daemon.c +1 -0
@@ -12,6 +12,7 @@#include "compat/fsmonitor/fsm-health.h" #include "compat/fsmonitor/fsm-listen.h" #include "fsmonitor--daemon.h" +#include "repository.h" #include "simple-ipc.h" #include "khash.h" #include "pkt-line.h"
commit-graph.c +1 -0
@@ -1,5 +1,6 @@#include "git-compat-util.h" #include "config.h" +#include "csum-file.h" #include "gettext.h" #include "hex.h" #include "lockfile.h"
Signature · 1 line
gitgitgadget
PATCH 12/12 treewide: remove unnecessary includes in source files
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
Signed-off-by Elijah Newren <[email protected]>
--- builtin/archive.c | 1 - builtin/commit-graph.c | 1 - builtin/fsck.c | 1 - builtin/fsmonitor--daemon.c | 2 -- builtin/grep.c | 1 - builtin/mktag.c | 1 - builtin/rev-list.c | 1 - builtin/send-pack.c | 1 - commit-graph.c | 1 - compat/simple-ipc/ipc-shared.c | 3 --- compat/simple-ipc/ipc-unix-socket.c | 1 - fsmonitor-ipc.c | 1 - http.c | 1 - line-log.c | 1 - merge-ort.c | 1 - notes-utils.c | 1 - ref-filter.c | 1 - remote-curl.c | 1 - repo-settings.c | 1 - t/helper/test-repository.c | 1 - trace2/tr2_ctr.c | 1 - trace2/tr2_tmr.c | 1 - 22 files changed, 25 deletions(-)
builtin/archive.c +0 -1
@@ -9,7 +9,6 @@#include "parse-options.h" #include "pkt-line.h" #include "repository.h" -#include "sideband.h" static void create_output_file (const char *output_file) {
builtin/commit-graph.c +0 -1
@@ -4,7 +4,6 @@#include "environment.h" #include "gettext.h" #include "hex.h" -#include "lockfile.h" #include "parse-options.h" #include "repository.h" #include "commit-graph.h"
builtin/fsck.c +0 -1
@@ -10,7 +10,6 @@#include "refs.h" #include "pack.h" #include "cache-tree.h" -#include "tree-walk.h" #include "fsck.h" #include "parse-options.h" #include "progress.h"
builtin/fsmonitor--daemon.c +0 -2
@@ -7,7 +7,6 @@#include "parse-options.h" #include "fsmonitor-ll.h" #include "fsmonitor-ipc.h" -#include "fsmonitor-path-utils.h" #include "fsmonitor-settings.h" #include "compat/fsmonitor/fsm-health.h" #include "compat/fsmonitor/fsm-listen.h"
@@ -15,7 +14,6 @@#include "repository.h" #include "simple-ipc.h" #include "khash.h" -#include "pkt-line.h" #include "run-command.h" #include "trace.h" #include "trace2.h"
builtin/grep.c +0 -1
@@ -14,7 +14,6 @@#include "parse-options.h" #include "string-list.h" #include "run-command.h" -#include "userdiff.h" #include "grep.h" #include "quote.h" #include "dir.h"
builtin/mktag.c +0 -1
@@ -3,7 +3,6 @@#include "hex.h" #include "parse-options.h" #include "strbuf.h" -#include "tag.h" #include "replace-object.h" #include "object-file.h" #include "object-store-ll.h"
builtin/rev-list.c +0 -1
@@ -12,7 +12,6 @@#include "object-name.h" #include "object-file.h" #include "object-store-ll.h" -#include "pack.h" #include "pack-bitmap.h" #include "log-tree.h" #include "graph.h"
builtin/send-pack.c +0 -1
@@ -2,7 +2,6 @@#include "config.h" #include "hex.h" #include "pkt-line.h" -#include "sideband.h" #include "run-command.h" #include "remote.h" #include "connect.h"
commit-graph.c +0 -1
@@ -4,7 +4,6 @@#include "gettext.h" #include "hex.h" #include "lockfile.h" -#include "pack.h" #include "packfile.h" #include "commit.h" #include "object.h"
compat/simple-ipc/ipc-shared.c +0 -3
@@ -1,8 +1,5 @@#include "git-compat-util.h" #include "simple-ipc.h" -#include "strbuf.h" -#include "pkt-line.h" -#include "thread-utils.h" #ifndef SUPPORTS_SIMPLE_IPC /*
compat/simple-ipc/ipc-unix-socket.c +0 -1
@@ -2,7 +2,6 @@#include "gettext.h" #include "simple-ipc.h" #include "strbuf.h" -#include "pkt-line.h" #include "thread-utils.h" #include "trace2.h" #include "unix-socket.h"
fsmonitor-ipc.c +0 -1
@@ -1,5 +1,4 @@#include "git-compat-util.h" -#include "fsmonitor-ll.h" #include "gettext.h" #include "simple-ipc.h" #include "fsmonitor-ipc.h"
http.c +0 -1
@@ -4,7 +4,6 @@#include "http.h" #include "config.h" #include "pack.h" -#include "sideband.h" #include "run-command.h" #include "url.h" #include "urlmatch.h"
line-log.c +0 -1
@@ -12,7 +12,6 @@#include "xdiff-interface.h" #include "strbuf.h" #include "log-tree.h" -#include "userdiff.h" #include "line-log.h" #include "setup.h" #include "strvec.h"
merge-ort.c +0 -1
@@ -41,7 +41,6 @@#include "revision.h" #include "sparse-index.h" #include "strmap.h" -#include "submodule.h" #include "trace2.h" #include "tree.h" #include "unpack-trees.h"
notes-utils.c +0 -1
@@ -5,7 +5,6 @@#include "gettext.h" #include "refs.h" #include "notes-utils.h" -#include "repository.h" #include "strbuf.h" void create_notes_commit(struct repository *r,
ref-filter.c +0 -1
@@ -29,7 +29,6 @@#include "commit-reach.h" #include "worktree.h" #include "hashmap.h" -#include "strvec.h" static struct ref_msg { const char *gone;
remote-curl.c +0 -1
@@ -11,7 +11,6 @@#include "run-command.h" #include "pkt-line.h" #include "string-list.h" -#include "sideband.h" #include "strvec.h" #include "credential.h" #include "oid-array.h"
repo-settings.c +0 -1
@@ -2,7 +2,6 @@#include "config.h" #include "repository.h" #include "midx.h" -#include "compat/fsmonitor/fsm-listen.h" static void repo_cfg_bool (struct repository *r,const char *key,int *dest,int def)
t/helper/test-repository.c +0 -1
@@ -3,7 +3,6 @@#include "commit.h" #include "environment.h" #include "hex.h" -#include "object-store-ll.h" #include "object.h" #include "repository.h" #include "setup.h"
trace2/tr2_ctr.c +0 -1
@@ -1,5 +1,4 @@#include "git-compat-util.h" -#include "thread-utils.h" #include "trace2/tr2_tgt.h" #include "trace2/tr2_tls.h" #include "trace2/tr2_ctr.h"
trace2/tr2_tmr.c +0 -1
@@ -1,5 +1,4 @@#include "git-compat-util.h" -#include "thread-utils.h" #include "trace2/tr2_tgt.h" #include "trace2/tr2_tls.h" #include "trace2/tr2_tmr.h"
Signature · 1 line
gitgitgadget
v2 cover Additional header cleanups (removing unnecessary includes)
In reply to Elijah Newren via GitGitGadgetHere are a number of header cleanups, to remove unnecessary includes.
(Sorry for the multiple day delay from when I said I'd send in an update; COVID sucks and knocked me out for multiple days and has me running on near empty.)
Changes since v1:
* Dropped three changes that conflicted with changes in next & seen (in attr.c, trace2.c, and test-trace2.c). After topics in next & seen merge down, I can submit a future patch that still does the relevant part of the cleanups that I'm dropping for now.
Elijah Newren (12):
treewide: remove unnecessary includes from header files
treewide: remove unnecessary includes in source files archive.h: remove unnecessary include
blame.h: remove unnecessary includes fsmonitor--daemon.h: remove unnecessary includes
http.h: remove unnecessary include
line-log.h: remove unnecessary include
pkt-line.h: remove unnecessary include submodule-config.h: remove unnecessary include trace2/tr2_tls.h: remove unnecessary include
treewide: add direct includes currently only pulled in transitively
treewide: remove unnecessary includes in source files
add-patch.c | 1 - apply.c | 1 - archive-tar.c | 1 + archive-zip.c | 1 + archive.c | 2 +- archive.h | 1 - bisect.c | 1 - blame.c | 2 ++ blame.h | 3 --- blob.c | 1 - bloom.c | 1 - builtin/add.c | 3 --- builtin/am.c | 4 ---- builtin/apply.c | 1 - builtin/archive.c | 1 - builtin/bisect.c | 1 - builtin/blame.c | 1 - builtin/branch.c | 3 --- builtin/cat-file.c | 1 - builtin/checkout-index.c | 1 - builtin/checkout.c | 3 --- builtin/clone.c | 1 - builtin/commit-graph.c | 3 +-- builtin/commit-tree.c | 3 --- builtin/commit.c | 8 -------- builtin/credential-cache.c | 2 -- builtin/describe.c | 2 -- builtin/diff-files.c | 1 - builtin/diff-index.c | 2 -- builtin/diff-tree.c | 1 - builtin/diff.c | 2 -- builtin/difftool.c | 1 - builtin/fast-export.c | 1 - builtin/fetch.c | 2 -- builtin/for-each-ref.c | 3 +-- builtin/fsck.c | 3 --- builtin/fsmonitor--daemon.c | 5 +++-- builtin/get-tar-commit-id.c | 1 - builtin/grep.c | 4 ---- builtin/hash-object.c | 1 - builtin/hook.c | 1 - builtin/index-pack.c | 2 -- builtin/init-db.c | 1 - builtin/log.c | 2 -- builtin/ls-files.c | 4 ---- builtin/ls-remote.c | 1 - builtin/ls-tree.c | 2 -- builtin/mailinfo.c | 1 - builtin/merge-base.c | 3 --- builtin/merge-recursive.c | 3 --- builtin/merge-tree.c | 1 - builtin/merge.c | 4 ---- builtin/mktag.c | 1 - builtin/mv.c | 1 - builtin/notes.c | 2 -- builtin/pack-objects.c | 3 --- builtin/pull.c | 5 ----- builtin/push.c | 1 - builtin/range-diff.c | 1 - builtin/read-tree.c | 2 -- builtin/rebase.c | 4 ---- builtin/receive-pack.c | 1 - builtin/repack.c | 1 - builtin/rerere.c | 1 - builtin/reset.c | 3 --- builtin/rev-list.c | 2 -- builtin/revert.c | 2 -- builtin/rm.c | 1 - builtin/send-pack.c | 5 ----- builtin/show-ref.c | 1 - builtin/sparse-checkout.c | 4 ---- builtin/stash.c | 1 - builtin/submodule--helper.c | 1 - builtin/tag.c | 1 - builtin/unpack-objects.c | 4 ---- builtin/update-ref.c | 1 - builtin/verify-commit.c | 2 -- builtin/verify-tag.c | 1 - bulk-checkin.c | 1 - bundle-uri.c | 1 - cache-tree.c | 1 - combine-diff.c | 1 - commit-graph.c | 3 +-- commit-reach.c | 1 - commit.c | 2 -- compat/fsmonitor/fsm-health-win32.c | 1 + compat/fsmonitor/fsm-listen-darwin.c | 1 + compat/fsmonitor/fsm-listen-win32.c | 1 + compat/simple-ipc/ipc-shared.c | 3 --- compat/simple-ipc/ipc-unix-socket.c | 1 - config.c | 3 --- delta-islands.c | 5 ----- diff-lib.c | 1 - diff-no-index.c | 3 --- diff.c | 2 -- diffcore-break.c | 1 - diffcore-delta.c | 1 - dir.c | 1 - entry.c | 1 - exec-cmd.c | 1 - fetch-pack.c | 2 -- fetch-pack.h | 1 - fsck.c | 1 - fsmonitor--daemon.h | 4 +--- fsmonitor-ipc.c | 1 - gettext.c | 2 -- gpg-interface.c | 1 - grep.c | 1 - http-fetch.c | 2 +- http-push.c | 3 +-- http-walker.c | 1 - http.c | 2 -- http.h | 1 - imap-send.c | 2 -- line-log.c | 4 +--- line-log.h | 2 -- line-range.c | 1 - list-objects-filter-options.c | 5 ----- list-objects-filter.c | 5 ----- log-tree.c | 1 + ls-refs.c | 1 - merge-blobs.c | 2 -- merge-ort.c | 3 --- merge-recursive.c | 5 ----- merge.c | 3 --- midx.h | 1 - negotiator/noop.c | 1 - notes-utils.c | 1 - notes.c | 2 -- object-file.c | 8 -------- object-name.c | 2 -- pack-bitmap-write.c | 3 --- pack-check.c | 1 - pack-write.c | 1 - packfile.c | 1 - parse-options.c | 2 -- patch-ids.c | 1 - pkt-line.c | 1 + pkt-line.h | 1 - protocol-caps.c | 1 - reachable.c | 1 - read-cache.c | 2 -- ref-filter.c | 3 --- ref-filter.h | 1 - reflog.c | 1 - refs/files-backend.c | 2 -- refs/packed-backend.c | 1 - refs/ref-cache.c | 1 - reftable/dump.c | 2 -- reftable/generic.c | 1 - reftable/merged.c | 1 - reftable/merged_test.c | 1 - reftable/reader.c | 1 - reftable/readwrite_test.c | 1 - reftable/refname_test.c | 1 - reftable/stack_test.c | 1 - reftable/test_framework.c | 1 - reftable/tree_test.c | 2 -- remote-curl.c | 3 +-- remote.c | 1 - repo-settings.c | 1 - rerere.c | 2 -- reset.c | 1 - revision.c | 2 -- run-command.c | 2 -- send-pack.c | 2 -- sequencer.c | 3 --- setup.c | 1 - shallow.c | 1 - shell.c | 1 - submodule-config.h | 2 -- submodule.c | 3 --- t/helper/test-bundle-uri.c | 2 -- t/helper/test-pkt-line.c | 1 + t/helper/test-reach.c | 2 -- t/helper/test-repository.c | 2 -- t/helper/test-simple-ipc.c | 1 - t/helper/test-submodule.c | 1 + tmp-objdir.c | 1 - trace2.c | 3 --- trace2/tr2_ctr.c | 1 - trace2/tr2_tgt_normal.c | 1 + trace2/tr2_tls.c | 1 + trace2/tr2_tls.h | 1 - trace2/tr2_tmr.c | 1 - transport-helper.c | 2 -- transport.c | 3 --- tree.c | 3 --- upload-pack.c | 6 ------ wrapper.c | 1 - xdiff-interface.c | 2 -- 191 files changed, 25 insertions(+), 335 deletions(-)
base-commit: 564d0252ca632e0264ed670534a51d18a689ef5d
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1617%2Fnewren%2Fheader-cleanup-6-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1617/newren/header-cleanup-6-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/1617
Range-diff vs v1:
1: 2f8ff69314e = 1: 2f8ff69314e treewide: remove unnecessary includes from header files
2: dbfb108214d ! 2: 4dcd52b117e treewide: remove unnecessary includes in source files
@@ archive.c
static char const * const archive_usage[] = {
- ## attr.c ##
-@@
- #include "utf8.h"
- #include "quote.h"
- #include "read-cache-ll.h"
--#include "revision.h"
- #include "object-store-ll.h"
- #include "setup.h"
- #include "thread-utils.h"
-
## bisect.c ##
@@
#include "refs.h"
@@ t/helper/test-bundle-uri.c
enum input_mode {
KEY_VALUE_PAIRS,
- ## t/helper/test-fast-rebase.c ##
-@@
- #include "read-cache-ll.h"
- #include "refs.h"
- #include "revision.h"
--#include "sequencer.h"
- #include "setup.h"
- #include "strvec.h"
- #include "tree.h"
-
## t/helper/test-reach.c ##
@@
#include "test-tool.h"
@@ t/helper/test-simple-ipc.c
#include "parse-options.h"
#include "thread-utils.h"
- ## t/helper/test-trace2.c ##
-@@
- #include "strvec.h"
- #include "run-command.h"
- #include "exec-cmd.h"
--#include "config.h"
- #include "repository.h"
- #include "trace2.h"
-
-
## tmp-objdir.c ##
@@
#include "environment.h"
@@ tmp-objdir.c
## trace2.c ##
@@
#include "git-compat-util.h"
--#include "config.h"
+ #include "config.h"
-#include "json-writer.h"
-#include "quote.h"
#include "repository.h"
3: 43222a4dac4 = 3: 6211270d678 archive.h: remove unnecessary include
4: bd69a954e9a = 4: e5ba799753d blame.h: remove unnecessary includes
5: a2e4bcc56fb = 5: 8ae3696197b fsmonitor--daemon.h: remove unnecessary includes
6: 393c5ca3a1d = 6: 29b7d47718c http.h: remove unnecessary include
7: 5f8014882e0 = 7: 7270441cd64 line-log.h: remove unnecessary include
8: bc1fe09e996 = 8: ab91f88a560 pkt-line.h: remove unnecessary include
9: 6d25811965c = 9: 95688443246 submodule-config.h: remove unnecessary include
10: 72fd5e2941f = 10: d9062fb11be trace2/tr2_tls.h: remove unnecessary include
11: c11b94bfc7c = 11: 0639ba03d50 treewide: add direct includes currently only pulled in transitively
12: 57f9da7bba0 = 12: 45f893e8e12 treewide: remove unnecessary includes in source filesSignature · 1 line
gitgitgadget
PATCH v2 1/12 treewide: remove unnecessary includes from header files
From: Elijah Newren <[email protected]>
There are three kinds of unnecessary includes:
* includes which aren't directly needed, but which include some other forgotten include
* includes which could be replaced by a simple forward declaration of some structs
* includes which aren't needed at all
Remove the third kind of include. Subsequent commits (and a subsequent series) will work on removing some of the other kinds of includes.
Signed-off-by Elijah Newren <[email protected]>
--- fetch-pack.h | 1 - midx.h | 1 - ref-filter.h | 1 - submodule-config.h | 1 - 4 files changed, 4 deletions(-)
fetch-pack.h +0 -1
@@ -2,7 +2,6 @@#define FETCH_PACK_H #include "string-list.h" -#include "run-command.h" #include "protocol.h" #include "list-objects-filter-options.h" #include "oidset.h"
midx.h +0 -1
@@ -1,7 +1,6 @@#ifndef MIDX_H #define MIDX_H -#include "repository.h" #include "string-list.h" struct object_id ;
ref-filter.h +0 -1
@@ -3,7 +3,6 @@#include "gettext.h" #include "oid-array.h" -#include "refs.h" #include "commit.h" #include "string-list.h" #include "strvec.h"
submodule-config.h +0 -1
@@ -2,7 +2,6 @@#define SUBMODULE_CONFIG_CACHE_H #include "config.h" -#include "hashmap.h" #include "submodule.h" #include "strbuf.h" #include "tree-walk.h"
Signature · 1 line
gitgitgadget
PATCH v2 2/12 treewide: remove unnecessary includes in source files
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
Each of these were checked with
gcc -E -I. ${SOURCE_FILE} | grep ${HEADER_FILE}
to ensure that removing the direct inclusion of the header actually resulted in that header no longer being included at all (i.e. that no other header pulled it in transitively).
...except for a few cases where we verified that although the header was brought in transitively, nothing from it was directly used in that source file. These cases were:
* builtin/credential-cache.c
* builtin/pull.c
* builtin/send-pack.c
Signed-off-by Elijah Newren <[email protected]>
--- add-patch.c | 1 - apply.c | 1 - archive.c | 1 - bisect.c | 1 - blob.c | 1 - bloom.c | 1 - builtin/add.c | 3 --- builtin/am.c | 4 ---- builtin/apply.c | 1 - builtin/bisect.c | 1 - builtin/blame.c | 1 - builtin/branch.c | 3 --- builtin/cat-file.c | 1 - builtin/checkout-index.c | 1 - builtin/checkout.c | 3 --- builtin/clone.c | 1 - builtin/commit-graph.c | 1 - builtin/commit-tree.c | 3 --- builtin/commit.c | 8 -------- builtin/credential-cache.c | 2 -- builtin/describe.c | 2 -- builtin/diff-files.c | 1 - builtin/diff-index.c | 2 -- builtin/diff-tree.c | 1 - builtin/diff.c | 2 -- builtin/difftool.c | 1 - builtin/fast-export.c | 1 - builtin/fetch.c | 2 -- builtin/for-each-ref.c | 2 -- builtin/fsck.c | 2 -- builtin/get-tar-commit-id.c | 1 - builtin/grep.c | 3 --- builtin/hash-object.c | 1 - builtin/hook.c | 1 - builtin/index-pack.c | 2 -- builtin/init-db.c | 1 - builtin/log.c | 2 -- builtin/ls-files.c | 4 ---- builtin/ls-remote.c | 1 - builtin/ls-tree.c | 2 -- builtin/mailinfo.c | 1 - builtin/merge-base.c | 3 --- builtin/merge-recursive.c | 3 --- builtin/merge-tree.c | 1 - builtin/merge.c | 4 ---- builtin/mv.c | 1 - builtin/notes.c | 2 -- builtin/pack-objects.c | 3 --- builtin/pull.c | 5 ----- builtin/push.c | 1 - builtin/range-diff.c | 1 - builtin/read-tree.c | 2 -- builtin/rebase.c | 4 ---- builtin/receive-pack.c | 1 - builtin/repack.c | 1 - builtin/rerere.c | 1 - builtin/reset.c | 3 --- builtin/rev-list.c | 1 - builtin/revert.c | 2 -- builtin/rm.c | 1 - builtin/send-pack.c | 4 ---- builtin/show-ref.c | 1 - builtin/sparse-checkout.c | 4 ---- builtin/stash.c | 1 - builtin/submodule--helper.c | 1 - builtin/tag.c | 1 - builtin/unpack-objects.c | 4 ---- builtin/update-ref.c | 1 - builtin/verify-commit.c | 2 -- builtin/verify-tag.c | 1 - bulk-checkin.c | 1 - bundle-uri.c | 1 - cache-tree.c | 1 - combine-diff.c | 1 - commit-graph.c | 1 - commit-reach.c | 1 - commit.c | 2 -- config.c | 3 --- delta-islands.c | 5 ----- diff-lib.c | 1 - diff-no-index.c | 3 --- diff.c | 2 -- diffcore-break.c | 1 - diffcore-delta.c | 1 - dir.c | 1 - entry.c | 1 - exec-cmd.c | 1 - fetch-pack.c | 2 -- fsck.c | 1 - gettext.c | 2 -- gpg-interface.c | 1 - grep.c | 1 - http-fetch.c | 1 - http-push.c | 2 -- http-walker.c | 1 - http.c | 1 - imap-send.c | 2 -- line-log.c | 2 -- line-range.c | 1 - list-objects-filter-options.c | 5 ----- list-objects-filter.c | 5 ----- ls-refs.c | 1 - merge-blobs.c | 2 -- merge-ort.c | 2 -- merge-recursive.c | 5 ----- merge.c | 3 --- negotiator/noop.c | 1 - notes.c | 2 -- object-file.c | 8 -------- object-name.c | 2 -- pack-bitmap-write.c | 3 --- pack-check.c | 1 - pack-write.c | 1 - packfile.c | 1 - parse-options.c | 2 -- patch-ids.c | 1 - protocol-caps.c | 1 - reachable.c | 1 - read-cache.c | 2 -- ref-filter.c | 2 -- reflog.c | 1 - refs/files-backend.c | 2 -- refs/packed-backend.c | 1 - refs/ref-cache.c | 1 - reftable/dump.c | 2 -- reftable/generic.c | 1 - reftable/merged.c | 1 - reftable/merged_test.c | 1 - reftable/reader.c | 1 - reftable/readwrite_test.c | 1 - reftable/refname_test.c | 1 - reftable/stack_test.c | 1 - reftable/test_framework.c | 1 - reftable/tree_test.c | 2 -- remote-curl.c | 1 - remote.c | 1 - rerere.c | 2 -- reset.c | 1 - revision.c | 2 -- run-command.c | 2 -- send-pack.c | 2 -- sequencer.c | 3 --- setup.c | 1 - shallow.c | 1 - shell.c | 1 - submodule.c | 3 --- t/helper/test-bundle-uri.c | 2 -- t/helper/test-reach.c | 2 -- t/helper/test-repository.c | 1 - t/helper/test-simple-ipc.c | 1 - tmp-objdir.c | 1 - trace2.c | 3 --- transport-helper.c | 2 -- transport.c | 3 --- tree.c | 3 --- upload-pack.c | 6 ------ wrapper.c | 1 - xdiff-interface.c | 2 -- 158 files changed, 293 deletions(-)
add-patch.c +0 -1
@@ -12,7 +12,6 @@#include "strvec.h" #include "pathspec.h" #include "color.h" -#include "diff.h" #include "compat/terminal.h" #include "prompt.h"
apply.c +0 -1
@@ -12,7 +12,6 @@#include "base85.h" #include "config.h" #include "object-store-ll.h" -#include "blob.h" #include "delta.h" #include "diff.h" #include "dir.h"
archive.c +0 -1
@@ -17,7 +17,6 @@#include "archive.h" #include "parse-options.h" #include "unpack-trees.h" -#include "dir.h" #include "quote.h" static char const *const archive_usage[] = {
bisect.c +0 -1
@@ -9,7 +9,6 @@#include "refs.h" #include "list-objects.h" #include "quote.h" -#include "hash-lookup.h" #include "run-command.h" #include "log-tree.h" #include "bisect.h"
blob.c +0 -1
@@ -1,6 +1,5 @@#include "git-compat-util.h" #include "blob.h" -#include "repository.h" #include "alloc.h" const char *blob_type ="blob" ;
bloom.c +0 -1
@@ -2,7 +2,6 @@#include "bloom.h" #include "diff.h" #include "diffcore.h" -#include "revision.h" #include "hashmap.h" #include "commit-graph.h" #include "commit.h"
builtin/add.c +0 -3
@@ -12,14 +12,11 @@#include "dir.h" #include "gettext.h" #include "pathspec.h" -#include "exec-cmd.h" -#include "cache-tree.h" #include "run-command.h" #include "parse-options.h" #include "path.h" #include "preload-index.h" #include "diff.h" -#include "diffcore.h" #include "read-cache.h" #include "repository.h" #include "revision.h"
builtin/am.c +0 -4
@@ -10,7 +10,6 @@#include "config.h" #include "editor.h" #include "environment.h" -#include "exec-cmd.h" #include "gettext.h" #include "hex.h" #include "parse-options.h"
@@ -24,7 +23,6 @@#include "refs.h" #include "commit.h" #include "diff.h" -#include "diffcore.h" #include "unpack-trees.h" #include "branch.h" #include "object-name.h"
@@ -35,11 +33,9 @@#include "log-tree.h" #include "notes-utils.h" #include "rerere.h" -#include "prompt.h" #include "mailinfo.h" #include "apply.h" #include "string-list.h" -#include "packfile.h" #include "pager.h" #include "path.h" #include "repository.h"
builtin/apply.c +0 -1
@@ -1,6 +1,5 @@#include "builtin.h" #include "gettext.h" -#include "parse-options.h" #include "repository.h" #include "apply.h"
builtin/bisect.c +0 -1
@@ -7,7 +7,6 @@#include "parse-options.h" #include "bisect.h" #include "refs.h" -#include "dir.h" #include "strvec.h" #include "run-command.h" #include "oid-array.h"
builtin/blame.c +0 -1
@@ -25,7 +25,6 @@#include "userdiff.h" #include "line-range.h" #include "line-log.h" -#include "dir.h" #include "progress.h" #include "object-name.h" #include "object-store-ll.h"
builtin/branch.c +0 -3
@@ -17,13 +17,10 @@#include "remote.h" #include "parse-options.h" #include "branch.h" -#include "diff.h" #include "path.h" -#include "revision.h" #include "string-list.h" #include "column.h" #include "utf8.h" -#include "wt-status.h" #include "ref-filter.h" #include "worktree.h" #include "help.h"
builtin/cat-file.c +0 -1
@@ -15,7 +15,6 @@#include "parse-options.h" #include "userdiff.h" #include "streaming.h" -#include "tree-walk.h" #include "oid-array.h" #include "packfile.h" #include "object-file.h"
builtin/checkout-index.c +0 -1
@@ -7,7 +7,6 @@#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "config.h" -#include "dir.h" #include "gettext.h" #include "lockfile.h" #include "quote.h"
builtin/checkout.c +0 -3
@@ -1,7 +1,6 @@#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "advice.h" -#include "blob.h" #include "branch.h" #include "cache-tree.h" #include "checkout.h"
@@ -27,10 +26,8 @@#include "remote.h" #include "resolve-undo.h" #include "revision.h" -#include "run-command.h" #include "setup.h" #include "submodule.h" -#include "submodule-config.h" #include "symlinks.h" #include "trace2.h" #include "tree.h"
builtin/clone.c +0 -1
@@ -19,7 +19,6 @@#include "hex.h" #include "lockfile.h" #include "parse-options.h" -#include "fetch-pack.h" #include "refs.h" #include "refspec.h" #include "object-file.h"
builtin/commit-graph.c +0 -1
@@ -1,7 +1,6 @@#include "builtin.h" #include "commit.h" #include "config.h" -#include "dir.h" #include "environment.h" #include "gettext.h" #include "hex.h"
builtin/commit-tree.c +0 -3
@@ -11,9 +11,6 @@#include "object-store-ll.h" #include "repository.h" #include "commit.h" -#include "tree.h" -#include "utf8.h" -#include "gpg-interface.h" #include "parse-options.h" static const char *const commit_tree_usage[] = {
builtin/commit.c +0 -8
@@ -16,17 +16,12 @@#include "editor.h" #include "environment.h" #include "diff.h" -#include "diffcore.h" #include "commit.h" #include "gettext.h" #include "revision.h" #include "wt-status.h" #include "run-command.h" -#include "hook.h" -#include "refs.h" -#include "log-tree.h" #include "strbuf.h" -#include "utf8.h" #include "object-name.h" #include "parse-options.h" #include "path.h"
@@ -35,9 +30,6 @@#include "string-list.h" #include "rerere.h" #include "unpack-trees.h" -#include "quote.h" -#include "submodule.h" -#include "gpg-interface.h" #include "column.h" #include "sequencer.h" #include "sparse-index.h"
builtin/credential-cache.c +0 -2
@@ -7,8 +7,6 @@#ifndef NO_UNIX_SOCKETS -#include "credential.h" -#include "string-list.h" #include "unix-socket.h" #include "run-command.h"
builtin/describe.c +0 -2
@@ -7,9 +7,7 @@#include "lockfile.h" #include "commit.h" #include "tag.h" -#include "blob.h" #include "refs.h" -#include "exec-cmd.h" #include "object-name.h" #include "parse-options.h" #include "read-cache-ll.h"
builtin/diff-files.c +0 -1
@@ -11,7 +11,6 @@#include "preload-index.h" #include "repository.h" #include "revision.h" -#include "submodule.h" static const char diff_files_usage[] ="git diff-files [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]"
builtin/diff-index.c +0 -2
@@ -7,8 +7,6 @@#include "repository.h" #include "revision.h" #include "setup.h" -#include "sparse-index.h" -#include "submodule.h" static const char diff_cache_usage[] ="git diff-index [-m] [--cached] [--merge-base] "
builtin/diff-tree.c +0 -1
@@ -6,7 +6,6 @@#include "gettext.h" #include "hex.h" #include "log-tree.h" -#include "submodule.h" #include "read-cache-ll.h" #include "repository.h" #include "revision.h"
builtin/diff.c +0 -2
@@ -10,7 +10,6 @@#include "lockfile.h" #include "color.h" #include "commit.h" -#include "blob.h" #include "gettext.h" #include "tag.h" #include "diff.h"
@@ -21,7 +20,6 @@#include "revision.h" #include "log-tree.h" #include "setup.h" -#include "submodule.h" #include "oid-array.h" #include "tree.h"
builtin/difftool.c +0 -1
@@ -18,7 +18,6 @@#include "copy.h" #include "run-command.h" #include "environment.h" -#include "exec-cmd.h" #include "gettext.h" #include "hex.h" #include "parse-options.h"
builtin/fast-export.c +0 -1
@@ -25,7 +25,6 @@#include "quote.h" #include "remote.h" #include "blob.h" -#include "commit-slab.h" static const char *fast_export_usage[] = {N_ ("git fast-export [<rev-list-opts>]" ),
builtin/fetch.c +0 -2
@@ -26,7 +26,6 @@#include "connected.h" #include "strvec.h" #include "utf8.h" -#include "packfile.h" #include "pager.h" #include "path.h" #include "pkt-line.h"
@@ -38,7 +37,6 @@#include "shallow.h" #include "trace.h" #include "trace2.h" -#include "worktree.h" #include "bundle-uri.h" #define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000)
builtin/for-each-ref.c +0 -2
@@ -1,13 +1,11 @@#include "builtin.h" #include "config.h" #include "gettext.h" -#include "refs.h" #include "object.h" #include "parse-options.h" #include "ref-filter.h" #include "strbuf.h" #include "strvec.h" -#include "commit-reach.h" static char const *const for_each_ref_usage[] = {N_ ("git for-each-ref [<options>] [<pattern>]" ),
builtin/fsck.c +0 -2
@@ -13,10 +13,8 @@#include "tree-walk.h" #include "fsck.h" #include "parse-options.h" -#include "dir.h" #include "progress.h" #include "streaming.h" -#include "decorate.h" #include "packfile.h" #include "object-file.h" #include "object-name.h"
builtin/get-tar-commit-id.c +0 -1
@@ -4,7 +4,6 @@#include "builtin.h" #include "commit.h" #include "tar.h" -#include "quote.h" static const char builtin_get_tar_commit_id_usage[] ="git get-tar-commit-id" ;
builtin/grep.c +0 -3
@@ -9,9 +9,6 @@#include "hex.h" #include "repository.h" #include "config.h" -#include "blob.h" -#include "tree.h" -#include "commit.h" #include "tag.h" #include "tree-walk.h" #include "parse-options.h"
builtin/hash-object.c +0 -1
@@ -14,7 +14,6 @@#include "blob.h" #include "quote.h" #include "parse-options.h" -#include "exec-cmd.h" #include "setup.h" #include "strbuf.h" #include "write-or-die.h"
builtin/hook.c +0 -1
@@ -3,7 +3,6 @@#include "gettext.h" #include "hook.h" #include "parse-options.h" -#include "strbuf.h" #include "strvec.h" #define BUILTIN_HOOK_RUN_USAGE \
builtin/index-pack.c +0 -2
@@ -8,11 +8,9 @@#include "csum-file.h" #include "blob.h" #include "commit.h" -#include "tag.h" #include "tree.h" #include "progress.h" #include "fsck.h" -#include "exec-cmd.h" #include "strbuf.h" #include "streaming.h" #include "thread-utils.h"
builtin/init-db.c +0 -1
@@ -5,7 +5,6 @@*/ #include "builtin.h" #include "abspath.h" -#include "config.h" #include "environment.h" #include "gettext.h" #include "object-file.h"
builtin/log.c +0 -2
@@ -26,7 +26,6 @@#include "tag.h" #include "reflog-walk.h" #include "patch-ids.h" -#include "run-command.h" #include "shortlog.h" #include "remote.h" #include "string-list.h"
@@ -36,7 +35,6 @@#include "streaming.h" #include "version.h" #include "mailmap.h" -#include "gpg-interface.h" #include "progress.h" #include "commit-slab.h" #include "repository.h"
builtin/ls-files.c +0 -4
@@ -14,19 +14,15 @@#include "gettext.h" #include "object-name.h" #include "strbuf.h" -#include "tree.h" -#include "cache-tree.h" #include "parse-options.h" #include "resolve-undo.h" #include "string-list.h" #include "path.h" #include "pathspec.h" #include "read-cache.h" -#include "run-command.h" #include "setup.h" #include "sparse-index.h" #include "submodule.h" -#include "submodule-config.h" #include "object-store.h" #include "hex.h"
builtin/ls-remote.c +0 -1
@@ -5,7 +5,6 @@#include "pkt-line.h" #include "ref-filter.h" #include "remote.h" -#include "refs.h" #include "parse-options.h" #include "wildmatch.h"
builtin/ls-tree.c +0 -2
@@ -9,9 +9,7 @@#include "hex.h" #include "object-name.h" #include "object-store-ll.h" -#include "blob.h" #include "tree.h" -#include "commit.h" #include "path.h" #include "quote.h" #include "parse-options.h"
builtin/mailinfo.c +0 -1
@@ -6,7 +6,6 @@#include "abspath.h" #include "environment.h" #include "gettext.h" -#include "utf8.h" #include "strbuf.h" #include "mailinfo.h" #include "parse-options.h"
builtin/merge-base.c +0 -3
@@ -3,9 +3,6 @@#include "commit.h" #include "gettext.h" #include "hex.h" -#include "refs.h" -#include "diff.h" -#include "revision.h" #include "object-name.h" #include "parse-options.h" #include "repository.h"
builtin/merge-recursive.c +0 -3
@@ -1,13 +1,10 @@#include "builtin.h" #include "advice.h" -#include "commit.h" #include "gettext.h" #include "hash.h" -#include "tag.h" #include "merge-recursive.h" #include "object-name.h" #include "repository.h" -#include "xdiff-interface.h" static const char builtin_merge_recursive_usage[] ="git %s <base>... -- <head> <remote> ..." ;
builtin/merge-tree.c +0 -1
@@ -13,7 +13,6 @@#include "parse-options.h" #include "repository.h" #include "blob.h" -#include "exec-cmd.h" #include "merge-blobs.h" #include "quote.h" #include "tree.h"
builtin/merge.c +0 -4
@@ -31,8 +31,6 @@#include "unpack-trees.h" #include "cache-tree.h" #include "dir.h" -#include "utf8.h" -#include "log-tree.h" #include "color.h" #include "rerere.h" #include "help.h"
@@ -42,10 +40,8 @@#include "resolve-undo.h" #include "remote.h" #include "fmt-merge-msg.h" -#include "gpg-interface.h" #include "sequencer.h" #include "string-list.h" -#include "packfile.h" #include "tag.h" #include "alias.h" #include "branch.h"
builtin/mv.c +0 -1
@@ -15,7 +15,6 @@#include "pathspec.h" #include "lockfile.h" #include "dir.h" -#include "cache-tree.h" #include "string-list.h" #include "parse-options.h" #include "read-cache-ll.h"
builtin/notes.c +0 -2
@@ -9,7 +9,6 @@#include "builtin.h" #include "config.h" -#include "alloc.h" #include "editor.h" #include "environment.h" #include "gettext.h"
@@ -19,7 +18,6 @@#include "object-store-ll.h" #include "path.h" #include "repository.h" -#include "blob.h" #include "pretty.h" #include "refs.h" #include "exec-cmd.h"
builtin/pack-objects.c +0 -3
@@ -6,10 +6,8 @@#include "config.h" #include "attr.h" #include "object.h" -#include "blob.h" #include "commit.h" #include "tag.h" -#include "tree.h" #include "delta.h" #include "pack.h" #include "pack-revindex.h"
@@ -18,7 +16,6 @@#include "diff.h" #include "revision.h" #include "list-objects.h" -#include "list-objects-filter.h" #include "list-objects-filter-options.h" #include "pack-objects.h" #include "progress.h"
builtin/pull.c +0 -5
@@ -14,7 +14,6 @@#include "merge.h" #include "object-name.h" #include "parse-options.h" -#include "exec-cmd.h" #include "run-command.h" #include "oid-array.h" #include "remote.h"
@@ -24,15 +23,11 @@#include "rebase.h" #include "refs.h" #include "refspec.h" -#include "revision.h" #include "submodule.h" #include "submodule-config.h" -#include "tempfile.h" -#include "lockfile.h" #include "wt-status.h" #include "commit-reach.h" #include "sequencer.h" -#include "packfile.h" /** * Parses the value of --rebase. If value is a false value, returns
builtin/push.c +0 -1
@@ -7,7 +7,6 @@#include "config.h" #include "environment.h" #include "gettext.h" -#include "refs.h" #include "refspec.h" #include "run-command.h" #include "remote.h"
builtin/range-diff.c +0 -1
@@ -5,7 +5,6 @@#include "range-diff.h" #include "config.h" #include "repository.h" -#include "revision.h" static const char *const builtin_range_diff_usage[] = {N_ ("git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" ),
builtin/read-tree.c +0 -2
@@ -16,14 +16,12 @@#include "tree-walk.h" #include "cache-tree.h" #include "unpack-trees.h" -#include "dir.h" #include "parse-options.h" #include "repository.h" #include "resolve-undo.h" #include "setup.h" #include "sparse-index.h" #include "submodule.h" -#include "submodule-config.h" static int nr_trees;static int read_empty;
builtin/rebase.c +0 -4
@@ -11,14 +11,10 @@#include "gettext.h" #include "hex.h" #include "run-command.h" -#include "exec-cmd.h" #include "strvec.h" #include "dir.h" -#include "packfile.h" #include "refs.h" -#include "quote.h" #include "config.h" -#include "cache-tree.h" #include "unpack-trees.h" #include "lockfile.h" #include "object-file.h"
builtin/receive-pack.c +0 -1
@@ -22,7 +22,6 @@#include "connected.h" #include "strvec.h" #include "version.h" -#include "tag.h" #include "gpg-interface.h" #include "sigchain.h" #include "fsck.h"
builtin/repack.c +0 -1
@@ -8,7 +8,6 @@#include "path.h" #include "run-command.h" #include "server-info.h" -#include "sigchain.h" #include "strbuf.h" #include "string-list.h" #include "strvec.h"
builtin/rerere.c +0 -1
@@ -1,6 +1,5 @@#include "builtin.h" #include "config.h" -#include "dir.h" #include "gettext.h" #include "parse-options.h" #include "repository.h"
builtin/reset.c +0 -3
@@ -16,10 +16,8 @@#include "hash.h" #include "hex.h" #include "lockfile.h" -#include "tag.h" #include "object.h" #include "pretty.h" -#include "run-command.h" #include "refs.h" #include "diff.h" #include "diffcore.h"
@@ -33,7 +31,6 @@#include "setup.h" #include "sparse-index.h" #include "submodule.h" -#include "submodule-config.h" #include "trace.h" #include "trace2.h" #include "dir.h"
builtin/rev-list.c +0 -1
@@ -7,7 +7,6 @@#include "hex.h" #include "revision.h" #include "list-objects.h" -#include "list-objects-filter.h" #include "list-objects-filter-options.h" #include "object.h" #include "object-name.h"
builtin/revert.c +0 -2
@@ -1,5 +1,4 @@#include "git-compat-util.h" -#include "config.h" #include "builtin.h" #include "parse-options.h" #include "diff.h"
@@ -7,7 +6,6 @@#include "repository.h" #include "revision.h" #include "rerere.h" -#include "dir.h" #include "sequencer.h" #include "branch.h"
builtin/rm.c +0 -1
@@ -9,7 +9,6 @@#include "config.h" #include "lockfile.h" #include "dir.h" -#include "cache-tree.h" #include "gettext.h" #include "hash.h" #include "tree-walk.h"
builtin/send-pack.c +0 -4
@@ -1,8 +1,6 @@#include "builtin.h" #include "config.h" -#include "commit.h" #include "hex.h" -#include "refs.h" #include "pkt-line.h" #include "sideband.h" #include "run-command.h"
@@ -11,9 +9,7 @@#include "send-pack.h" #include "quote.h" #include "transport.h" -#include "version.h" #include "oid-array.h" -#include "gpg-interface.h" #include "gettext.h" #include "protocol.h" #include "parse-options.h"
builtin/show-ref.c +0 -1
@@ -6,7 +6,6 @@#include "object-name.h" #include "object-store-ll.h" #include "object.h" -#include "tag.h" #include "string-list.h" #include "parse-options.h"
builtin/sparse-checkout.c +0 -4
@@ -8,14 +8,10 @@#include "parse-options.h" #include "pathspec.h" #include "repository.h" -#include "run-command.h" #include "strbuf.h" #include "string-list.h" -#include "cache-tree.h" #include "lockfile.h" -#include "resolve-undo.h" #include "unpack-trees.h" -#include "wt-status.h" #include "quote.h" #include "setup.h" #include "sparse-index.h"
builtin/stash.c +0 -1
@@ -26,7 +26,6 @@#include "sparse-index.h" #include "log-tree.h" #include "diffcore.h" -#include "exec-cmd.h" #include "reflog.h" #include "add-interactive.h"
builtin/submodule--helper.c +0 -1
@@ -22,7 +22,6 @@#include "remote.h" #include "refs.h" #include "refspec.h" -#include "connect.h" #include "revision.h" #include "diffcore.h" #include "diff.h"
builtin/tag.c +0 -1
@@ -18,7 +18,6 @@#include "object-store-ll.h" #include "path.h" #include "tag.h" -#include "run-command.h" #include "parse-options.h" #include "diff.h" #include "revision.h"
builtin/unpack-objects.c +0 -4
@@ -10,12 +10,8 @@#include "delta.h" #include "pack.h" #include "blob.h" -#include "commit.h" #include "replace-object.h" #include "strbuf.h" -#include "tag.h" -#include "tree.h" -#include "tree-walk.h" #include "progress.h" #include "decorate.h" #include "fsck.h"
builtin/update-ref.c +0 -1
@@ -7,7 +7,6 @@#include "parse-options.h" #include "quote.h" #include "repository.h" -#include "strvec.h" static const char *const git_update_ref_usage[] = {N_ ("git update-ref [<options>] -d <refname> [<old-val>]" ),
builtin/verify-commit.c +0 -2
@@ -9,10 +9,8 @@#include "config.h" #include "gettext.h" #include "object-name.h" -#include "object-store-ll.h" #include "repository.h" #include "commit.h" -#include "run-command.h" #include "parse-options.h" #include "gpg-interface.h"
builtin/verify-tag.c +0 -1
@@ -9,7 +9,6 @@#include "config.h" #include "gettext.h" #include "tag.h" -#include "run-command.h" #include "object-name.h" #include "parse-options.h" #include "gpg-interface.h"
bulk-checkin.c +0 -1
@@ -11,7 +11,6 @@#include "csum-file.h" #include "pack.h" #include "strbuf.h" -#include "string-list.h" #include "tmp-objdir.h" #include "packfile.h" #include "object-file.h"
bundle-uri.c +0 -1
@@ -4,7 +4,6 @@#include "copy.h" #include "environment.h" #include "gettext.h" -#include "object-store-ll.h" #include "refs.h" #include "run-command.h" #include "hashmap.h"
cache-tree.c +0 -1
@@ -11,7 +11,6 @@#include "read-cache-ll.h" #include "replace-object.h" #include "promisor-remote.h" -#include "sparse-index.h" #include "trace.h" #include "trace2.h"
combine-diff.c +0 -1
@@ -2,7 +2,6 @@#include "object-store-ll.h" #include "commit.h" #include "convert.h" -#include "blob.h" #include "diff.h" #include "diffcore.h" #include "environment.h"
commit-graph.c +0 -1
@@ -8,7 +8,6 @@#include "commit.h" #include "object.h" #include "refs.h" -#include "revision.h" #include "hash-lookup.h" #include "commit-graph.h" #include "object-file.h"
commit-reach.c +0 -1
@@ -4,7 +4,6 @@#include "decorate.h" #include "hex.h" #include "prio-queue.h" -#include "tree.h" #include "ref-filter.h" #include "revision.h" #include "tag.h"
commit.c +0 -2
@@ -8,7 +8,6 @@#include "repository.h" #include "object-name.h" #include "object-store-ll.h" -#include "pkt-line.h" #include "utf8.h" #include "diff.h" #include "revision.h"
@@ -23,7 +22,6 @@#include "advice.h" #include "refs.h" #include "commit-reach.h" -#include "run-command.h" #include "setup.h" #include "shallow.h" #include "tree.h"
config.c +0 -3
@@ -30,15 +30,12 @@#include "pager.h" #include "path.h" #include "utf8.h" -#include "dir.h" #include "color.h" -#include "replace-object.h" #include "refs.h" #include "setup.h" #include "strvec.h" #include "trace2.h" #include "wildmatch.h" -#include "worktree.h" #include "ws.h" #include "write-or-die.h"
delta-islands.c +0 -5
@@ -1,18 +1,13 @@#include "git-compat-util.h" -#include "attr.h" #include "object.h" -#include "blob.h" #include "commit.h" #include "gettext.h" #include "hex.h" #include "tag.h" #include "tree.h" -#include "delta.h" #include "pack.h" #include "tree-walk.h" #include "diff.h" -#include "revision.h" -#include "list-objects.h" #include "progress.h" #include "refs.h" #include "khash.h"
diff-lib.c +0 -1
@@ -2,7 +2,6 @@* Copyright (C) 2005 Junio C Hamano */ #include "git-compat-util.h" -#include "quote.h" #include "commit.h" #include "diff.h" #include "diffcore.h"
diff-no-index.c +0 -3
@@ -8,13 +8,10 @@#include "abspath.h" #include "color.h" #include "commit.h" -#include "blob.h" -#include "tag.h" #include "diff.h" #include "diffcore.h" #include "gettext.h" #include "revision.h" -#include "log-tree.h" #include "parse-options.h" #include "string-list.h" #include "dir.h"
diff.c +0 -2
@@ -16,12 +16,10 @@#include "hex.h" #include "xdiff-interface.h" #include "color.h" -#include "attr.h" #include "run-command.h" #include "utf8.h" #include "object-store-ll.h" #include "userdiff.h" -#include "submodule-config.h" #include "submodule.h" #include "hashmap.h" #include "mem-pool.h"
diffcore-break.c +0 -1
@@ -2,7 +2,6 @@* Copyright (C) 2005 Junio C Hamano */ #include "git-compat-util.h" -#include "diff.h" #include "diffcore.h" #include "hash.h" #include "object.h"
diffcore-delta.c +0 -1
@@ -1,5 +1,4 @@#include "git-compat-util.h" -#include "diff.h" #include "diffcore.h" /*
dir.c +0 -1
@@ -16,7 +16,6 @@#include "object-file.h" #include "object-store-ll.h" #include "path.h" -#include "attr.h" #include "refs.h" #include "wildmatch.h" #include "pathspec.h"
entry.c +0 -1
@@ -1,5 +1,4 @@#include "git-compat-util.h" -#include "blob.h" #include "object-store-ll.h" #include "dir.h" #include "environment.h"
exec-cmd.c +0 -1
@@ -4,7 +4,6 @@#include "exec-cmd.h" #include "gettext.h" #include "path.h" -#include "quote.h" #include "run-command.h" #include "strvec.h" #include "trace.h"
fetch-pack.c +0 -2
@@ -10,7 +10,6 @@#include "pkt-line.h" #include "commit.h" #include "tag.h" -#include "exec-cmd.h" #include "pack.h" #include "sideband.h" #include "fetch-pack.h"
@@ -18,7 +17,6 @@#include "run-command.h" #include "connect.h" #include "trace2.h" -#include "transport.h" #include "version.h" #include "oid-array.h" #include "oidset.h"
fsck.c +0 -1
@@ -16,7 +16,6 @@#include "refs.h" #include "url.h" #include "utf8.h" -#include "decorate.h" #include "oidset.h" #include "packfile.h" #include "submodule-config.h"
gettext.c +0 -2
@@ -7,9 +7,7 @@#include "environment.h" #include "exec-cmd.h" #include "gettext.h" -#include "strbuf.h" #include "utf8.h" -#include "config.h" #ifndef NO_GETTEXT # include <libintl.h>
gpg-interface.c +0 -1
@@ -12,7 +12,6 @@#include "sigchain.h" #include "tempfile.h" #include "alias.h" -#include "environment.h" static int git_gpg_config (const char *,const char *,const struct config_context *,void *);
grep.c +0 -1
@@ -9,7 +9,6 @@#include "xdiff-interface.h" #include "diff.h" #include "diffcore.h" -#include "commit.h" #include "quote.h" #include "help.h"
http-fetch.c +0 -1
@@ -1,6 +1,5 @@#include "git-compat-util.h" #include "config.h" -#include "exec-cmd.h" #include "gettext.h" #include "hex.h" #include "http.h"
http-push.c +0 -2
@@ -6,10 +6,8 @@#include "tag.h" #include "blob.h" #include "http.h" -#include "refs.h" #include "diff.h" #include "revision.h" -#include "exec-cmd.h" #include "remote.h" #include "list-objects.h" #include "setup.h"
http-walker.c +0 -1
@@ -1,6 +1,5 @@#include "git-compat-util.h" #include "repository.h" -#include "commit.h" #include "hex.h" #include "walker.h" #include "http.h"
http.c +0 -1
@@ -15,7 +15,6 @@#include "trace.h" #include "transport.h" #include "packfile.h" -#include "protocol.h" #include "string-list.h" #include "object-file.h" #include "object-store-ll.h"
imap-send.c +0 -2
@@ -24,12 +24,10 @@#include "git-compat-util.h" #include "config.h" #include "credential.h" -#include "exec-cmd.h" #include "gettext.h" #include "run-command.h" #include "parse-options.h" #include "setup.h" -#include "strbuf.h" #if defined(NO_OPENSSL ) && !defined(HAVE_OPENSSL_CSPRNG )typedef void *SSL ;#endif
line-log.c +0 -2
@@ -2,7 +2,6 @@#include "line-range.h" #include "hex.h" #include "tag.h" -#include "blob.h" #include "tree.h" #include "diff.h" #include "commit.h"
@@ -12,7 +11,6 @@#include "xdiff-interface.h" #include "strbuf.h" #include "log-tree.h" -#include "graph.h" #include "userdiff.h" #include "line-log.h" #include "setup.h"
line-range.c +0 -1
@@ -1,7 +1,6 @@#include "git-compat-util.h" #include "line-range.h" #include "xdiff-interface.h" -#include "strbuf.h" #include "userdiff.h" /*
list-objects-filter-options.c +0 -5
@@ -1,11 +1,6 @@#include "git-compat-util.h" -#include "commit.h" #include "config.h" #include "gettext.h" -#include "revision.h" -#include "strvec.h" -#include "list-objects.h" -#include "list-objects-filter.h" #include "list-objects-filter-options.h" #include "promisor-remote.h" #include "trace.h"
list-objects-filter.c +0 -5
@@ -2,14 +2,9 @@#include "dir.h" #include "gettext.h" #include "hex.h" -#include "tag.h" #include "commit.h" -#include "tree.h" -#include "blob.h" #include "diff.h" -#include "tree-walk.h" #include "revision.h" -#include "list-objects.h" #include "list-objects-filter.h" #include "list-objects-filter-options.h" #include "oidmap.h"
ls-refs.c +0 -1
@@ -5,7 +5,6 @@#include "hex.h" #include "repository.h" #include "refs.h" -#include "remote.h" #include "strvec.h" #include "ls-refs.h" #include "pkt-line.h"
merge-blobs.c +0 -2
@@ -1,6 +1,4 @@#include "git-compat-util.h" -#include "run-command.h" -#include "xdiff-interface.h" #include "merge-ll.h" #include "blob.h" #include "merge-blobs.h"
merge-ort.c +0 -2
@@ -19,7 +19,6 @@#include "alloc.h" #include "attr.h" -#include "blob.h" #include "cache-tree.h" #include "commit.h" #include "commit-reach.h"
@@ -42,7 +41,6 @@#include "revision.h" #include "sparse-index.h" #include "strmap.h" -#include "submodule-config.h" #include "submodule.h" #include "trace2.h" #include "tree.h"
merge-recursive.c +0 -5
@@ -6,10 +6,7 @@#include "git-compat-util.h" #include "merge-recursive.h" -#include "advice.h" #include "alloc.h" -#include "attr.h" -#include "blob.h" #include "cache-tree.h" #include "commit.h" #include "commit-reach.h"
@@ -32,8 +29,6 @@#include "revision.h" #include "sparse-index.h" #include "string-list.h" -#include "submodule-config.h" -#include "submodule.h" #include "symlinks.h" #include "tag.h" #include "tree-walk.h"
merge.c +0 -3
@@ -1,6 +1,4 @@#include "git-compat-util.h" -#include "diff.h" -#include "diffcore.h" #include "gettext.h" #include "hash.h" #include "hex.h"
@@ -13,7 +11,6 @@#include "tree.h" #include "tree-walk.h" #include "unpack-trees.h" -#include "dir.h" static const char *merge_argument (struct commit *commit) {
negotiator/noop.c +0 -1
@@ -1,6 +1,5 @@#include "git-compat-util.h" #include "noop.h" -#include "../commit.h" #include "../fetch-negotiator.h" static void known_common(struct fetch_negotiator *n UNUSED,
notes.c +0 -2
@@ -5,8 +5,6 @@#include "notes.h" #include "object-name.h" #include "object-store-ll.h" -#include "blob.h" -#include "tree.h" #include "utf8.h" #include "strbuf.h" #include "tree-walk.h"
object-file.c +0 -8
@@ -15,24 +15,16 @@#include "hex.h" #include "string-list.h" #include "lockfile.h" -#include "delta.h" #include "pack.h" -#include "blob.h" #include "commit.h" #include "run-command.h" -#include "tag.h" -#include "tree.h" -#include "tree-walk.h" #include "refs.h" -#include "pack-revindex.h" -#include "hash-lookup.h" #include "bulk-checkin.h" #include "repository.h" #include "replace-object.h" #include "streaming.h" #include "dir.h" #include "list.h" -#include "mergesort.h" #include "quote.h" #include "packfile.h" #include "object-file.h"
object-name.c +0 -2
@@ -8,7 +8,6 @@#include "tag.h" #include "commit.h" #include "tree.h" -#include "blob.h" #include "tree-walk.h" #include "refs.h" #include "remote.h"
@@ -21,7 +20,6 @@#include "read-cache-ll.h" #include "repository.h" #include "setup.h" -#include "submodule.h" #include "midx.h" #include "commit-reach.h" #include "date.h"
pack-bitmap-write.c +0 -3
@@ -4,12 +4,9 @@#include "hex.h" #include "object-store-ll.h" #include "commit.h" -#include "tag.h" #include "diff.h" #include "revision.h" -#include "list-objects.h" #include "progress.h" -#include "pack-revindex.h" #include "pack.h" #include "pack-bitmap.h" #include "hash-lookup.h"
pack-check.c +0 -1
@@ -3,7 +3,6 @@#include "hex.h" #include "repository.h" #include "pack.h" -#include "pack-revindex.h" #include "progress.h" #include "packfile.h" #include "object-file.h"
pack-write.c +0 -1
@@ -7,7 +7,6 @@#include "remote.h" #include "chunk-format.h" #include "pack-mtimes.h" -#include "oidmap.h" #include "pack-objects.h" #include "pack-revindex.h" #include "path.h"
packfile.c +0 -1
@@ -9,7 +9,6 @@#include "mergesort.h" #include "packfile.h" #include "delta.h" -#include "streaming.h" #include "hash-lookup.h" #include "commit.h" #include "object.h"
parse-options.c +0 -2
@@ -2,8 +2,6 @@#include "parse-options.h" #include "abspath.h" #include "parse.h" -#include "commit.h" -#include "color.h" #include "gettext.h" #include "strbuf.h" #include "string-list.h"
patch-ids.c +0 -1
@@ -2,7 +2,6 @@#include "diff.h" #include "commit.h" #include "hash.h" -#include "hash-lookup.h" #include "hex.h" #include "patch-ids.h"
protocol-caps.c +0 -1
@@ -3,7 +3,6 @@#include "gettext.h" #include "hex.h" #include "pkt-line.h" -#include "strvec.h" #include "hash-ll.h" #include "hex.h" #include "object.h"
reachable.c +0 -1
@@ -2,7 +2,6 @@#include "gettext.h" #include "hex.h" #include "refs.h" -#include "tag.h" #include "commit.h" #include "blob.h" #include "diff.h"
read-cache.c +0 -2
@@ -20,7 +20,6 @@#include "oid-array.h" #include "tree.h" #include "commit.h" -#include "blob.h" #include "environment.h" #include "gettext.h" #include "mem-pool.h"
@@ -31,7 +30,6 @@#include "read-cache.h" #include "resolve-undo.h" #include "revision.h" -#include "run-command.h" #include "strbuf.h" #include "trace2.h" #include "varint.h"
ref-filter.c +0 -2
@@ -22,12 +22,10 @@#include "ref-filter.h" #include "revision.h" #include "utf8.h" -#include "version.h" #include "versioncmp.h" #include "trailer.h" #include "wt-status.h" #include "commit-slab.h" -#include "commit-graph.h" #include "commit-reach.h" #include "worktree.h" #include "hashmap.h"
reflog.c +0 -1
@@ -6,7 +6,6 @@#include "revision.h" #include "tree.h" #include "tree-walk.h" -#include "worktree.h" /* Remember to update object flag allocation in object.h */ #define INCOMPLETE (1u<<10)
refs/files-backend.c +0 -2
@@ -1,5 +1,4 @@#include "../git-compat-util.h" -#include "../config.h" #include "../copy.h" #include "../environment.h" #include "../gettext.h"
@@ -19,7 +18,6 @@#include "../dir.h" #include "../chdir-notify.h" #include "../setup.h" -#include "../worktree.h" #include "../wrapper.h" #include "../write-or-die.h" #include "../revision.h"
refs/packed-backend.c +0 -1
@@ -1,5 +1,4 @@#include "../git-compat-util.h" -#include "../alloc.h" #include "../config.h" #include "../gettext.h" #include "../hash.h"
refs/ref-cache.c +0 -1
@@ -1,5 +1,4 @@#include "../git-compat-util.h" -#include "../alloc.h" #include "../hash.h" #include "../refs.h" #include "../repository.h"
reftable/dump.c +0 -2
@@ -11,14 +11,12 @@ https://developers.google.com/open-source/licenses/bsd#include "reftable-blocksource.h" #include "reftable-error.h" -#include "reftable-merged.h" #include "reftable-record.h" #include "reftable-tests.h" #include "reftable-writer.h" #include "reftable-iterator.h" #include "reftable-reader.h" #include "reftable-stack.h" -#include "reftable-generic.h" #include <stddef.h> #include <stdio.h>
reftable/generic.c +0 -1
@@ -6,7 +6,6 @@ license that can be found in the LICENSE file or athttps://developers.google.com/open-source/licenses/bsd */ -#include "basics.h" #include "constants.h" #include "record.h" #include "generic.h"
reftable/merged.c +0 -1
@@ -11,7 +11,6 @@ https://developers.google.com/open-source/licenses/bsd#include "constants.h" #include "iter.h" #include "pq.h" -#include "reader.h" #include "record.h" #include "generic.h" #include "reftable-merged.h"
reftable/merged_test.c +0 -1
@@ -12,7 +12,6 @@ https://developers.google.com/open-source/licenses/bsd#include "basics.h" #include "blocksource.h" -#include "constants.h" #include "reader.h" #include "record.h" #include "test_framework.h"
reftable/reader.c +0 -1
@@ -16,7 +16,6 @@ https://developers.google.com/open-source/licenses/bsd#include "record.h" #include "reftable-error.h" #include "reftable-generic.h" -#include "tree.h" uint64_t block_source_size (struct reftable_block_source *source) {
reftable/readwrite_test.c +0 -1
@@ -11,7 +11,6 @@ https://developers.google.com/open-source/licenses/bsd#include "basics.h" #include "block.h" #include "blocksource.h" -#include "constants.h" #include "reader.h" #include "record.h" #include "test_framework.h"
reftable/refname_test.c +0 -1
@@ -9,7 +9,6 @@ https://developers.google.com/open-source/licenses/bsd#include "basics.h" #include "block.h" #include "blocksource.h" -#include "constants.h" #include "reader.h" #include "record.h" #include "refname.h"
reftable/stack_test.c +0 -1
@@ -13,7 +13,6 @@ https://developers.google.com/open-source/licenses/bsd#include "reftable-reader.h" #include "merged.h" #include "basics.h" -#include "constants.h" #include "record.h" #include "test_framework.h" #include "reftable-tests.h"
reftable/test_framework.c +0 -1
@@ -9,7 +9,6 @@ https://developers.google.com/open-source/licenses/bsd#include "system.h" #include "test_framework.h" -#include "basics.h" void set_test_hash (uint8_t *p,int i) {
reftable/tree_test.c +0 -2
@@ -9,8 +9,6 @@ https://developers.google.com/open-source/licenses/bsd#include "system.h" #include "tree.h" -#include "basics.h" -#include "record.h" #include "test_framework.h" #include "reftable-tests.h"
remote-curl.c +0 -1
@@ -8,7 +8,6 @@#include "strbuf.h" #include "walker.h" #include "http.h" -#include "exec-cmd.h" #include "run-command.h" #include "pkt-line.h" #include "string-list.h"
remote.c +0 -1
@@ -15,7 +15,6 @@#include "diff.h" #include "revision.h" #include "dir.h" -#include "tag.h" #include "setup.h" #include "string-list.h" #include "strvec.h"
rerere.c +0 -2
@@ -12,12 +12,10 @@#include "dir.h" #include "resolve-undo.h" #include "merge-ll.h" -#include "attr.h" #include "path.h" #include "pathspec.h" #include "object-file.h" #include "object-store-ll.h" -#include "hash-lookup.h" #include "strmap.h" #define RESOLVED 0
reset.c +0 -1
@@ -6,7 +6,6 @@#include "object-name.h" #include "refs.h" #include "reset.h" -#include "run-command.h" #include "tree-walk.h" #include "tree.h" #include "unpack-trees.h"
revision.c +0 -2
@@ -21,12 +21,10 @@#include "reflog-walk.h" #include "patch-ids.h" #include "decorate.h" -#include "log-tree.h" #include "string-list.h" #include "line-log.h" #include "mailmap.h" #include "commit-slab.h" -#include "dir.h" #include "cache-tree.h" #include "bisect.h" #include "packfile.h"
run-command.c +0 -2
@@ -14,9 +14,7 @@#include "quote.h" #include "config.h" #include "packfile.h" -#include "hook.h" #include "compat/nonblock.h" -#include "alloc.h" void child_process_init (struct child_process *child) {
send-pack.c +0 -2
@@ -4,7 +4,6 @@#include "date.h" #include "gettext.h" #include "hex.h" -#include "refs.h" #include "object-store-ll.h" #include "pkt-line.h" #include "sideband.h"
@@ -12,7 +11,6 @@#include "remote.h" #include "connect.h" #include "send-pack.h" -#include "quote.h" #include "transport.h" #include "version.h" #include "oid-array.h"
sequencer.c +0 -3
@@ -15,10 +15,8 @@#include "pager.h" #include "commit.h" #include "sequencer.h" -#include "tag.h" #include "run-command.h" #include "hook.h" -#include "exec-cmd.h" #include "utf8.h" #include "cache-tree.h" #include "diff.h"
@@ -39,7 +37,6 @@#include "notes-utils.h" #include "sigchain.h" #include "unpack-trees.h" -#include "worktree.h" #include "oidmap.h" #include "oidset.h" #include "commit-slab.h"
setup.c +0 -1
@@ -13,7 +13,6 @@#include "string-list.h" #include "chdir-notify.h" #include "path.h" -#include "promisor-remote.h" #include "quote.h" #include "trace2.h" #include "worktree.h"
shallow.c +0 -1
@@ -7,7 +7,6 @@#include "commit.h" #include "tag.h" #include "pkt-line.h" -#include "remote.h" #include "refs.h" #include "oid-array.h" #include "path.h"
shell.c +0 -1
@@ -4,7 +4,6 @@#include "strbuf.h" #include "run-command.h" #include "alias.h" -#include "prompt.h" #define COMMAND_DIR "git-shell-commands"#define HELP_COMMAND COMMAND_DIR "/help"
submodule.c +0 -3
@@ -17,10 +17,8 @@#include "string-list.h" #include "oid-array.h" #include "strvec.h" -#include "blob.h" #include "thread-utils.h" #include "path.h" -#include "quote.h" #include "remote.h" #include "worktree.h" #include "parse-options.h"
@@ -30,7 +28,6 @@#include "commit-reach.h" #include "read-cache-ll.h" #include "setup.h" -#include "shallow.h" #include "trace2.h" static int config_update_recurse_submodules =RECURSE_SUBMODULES_OFF ;
t/helper/test-bundle-uri.c +0 -2
@@ -5,9 +5,7 @@#include "strbuf.h" #include "string-list.h" #include "transport.h" -#include "ref-filter.h" #include "remote.h" -#include "refs.h" enum input_mode {KEY_VALUE_PAIRS ,
t/helper/test-reach.c +0 -2
@@ -1,11 +1,9 @@#include "test-tool.h" #include "commit.h" #include "commit-reach.h" -#include "config.h" #include "gettext.h" #include "hex.h" #include "object-name.h" -#include "parse-options.h" #include "ref-filter.h" #include "setup.h" #include "string-list.h"
t/helper/test-repository.c +0 -1
@@ -1,7 +1,6 @@#include "test-tool.h" #include "commit-graph.h" #include "commit.h" -#include "config.h" #include "environment.h" #include "hex.h" #include "object-store-ll.h"
t/helper/test-simple-ipc.c +0 -1
@@ -4,7 +4,6 @@#include "test-tool.h" #include "gettext.h" -#include "strbuf.h" #include "simple-ipc.h" #include "parse-options.h" #include "thread-utils.h"
tmp-objdir.c +0 -1
@@ -6,7 +6,6 @@#include "environment.h" #include "object-file.h" #include "path.h" -#include "sigchain.h" #include "string-list.h" #include "strbuf.h" #include "strvec.h"
trace2.c +0 -3
@@ -1,12 +1,9 @@#include "git-compat-util.h" #include "config.h" -#include "json-writer.h" -#include "quote.h" #include "repository.h" #include "run-command.h" #include "sigchain.h" #include "thread-utils.h" -#include "version.h" #include "trace.h" #include "trace2.h" #include "trace2/tr2_cfg.h"
transport-helper.c +0 -2
@@ -3,13 +3,11 @@#include "quote.h" #include "run-command.h" #include "commit.h" -#include "diff.h" #include "environment.h" #include "gettext.h" #include "hex.h" #include "object-name.h" #include "repository.h" -#include "revision.h" #include "remote.h" #include "string-list.h" #include "thread-utils.h"
transport.c +0 -3
@@ -10,9 +10,7 @@#include "remote.h" #include "connect.h" #include "send-pack.h" -#include "walker.h" #include "bundle.h" -#include "dir.h" #include "gettext.h" #include "refs.h" #include "refspec.h"
@@ -26,7 +24,6 @@#include "transport-internal.h" #include "protocol.h" #include "object-name.h" -#include "object-store-ll.h" #include "color.h" #include "bundle-uri.h"
tree.c +0 -3
@@ -1,12 +1,9 @@#include "git-compat-util.h" -#include "cache-tree.h" #include "hex.h" #include "tree.h" #include "object-name.h" #include "object-store-ll.h" -#include "blob.h" #include "commit.h" -#include "tag.h" #include "alloc.h" #include "tree-walk.h" #include "repository.h"
upload-pack.c +0 -6
@@ -9,13 +9,10 @@#include "repository.h" #include "object-store-ll.h" #include "oid-array.h" -#include "tag.h" #include "object.h" #include "commit.h" #include "diff.h" #include "revision.h" -#include "list-objects.h" -#include "list-objects-filter.h" #include "list-objects-filter-options.h" #include "run-command.h" #include "connect.h"
@@ -24,11 +21,8 @@#include "string-list.h" #include "strvec.h" #include "trace2.h" -#include "prio-queue.h" #include "protocol.h" -#include "quote.h" #include "upload-pack.h" -#include "serve.h" #include "commit-graph.h" #include "commit-reach.h" #include "shallow.h"
wrapper.c +0 -1
@@ -5,7 +5,6 @@#include "abspath.h" #include "parse.h" #include "gettext.h" -#include "repository.h" #include "strbuf.h" #include "trace2.h"
xdiff-interface.c +0 -2
@@ -6,8 +6,6 @@#include "xdiff-interface.h" #include "xdiff/xtypes.h" #include "xdiff/xdiffi.h" -#include "xdiff/xemit.h" -#include "xdiff/xmacros.h" #include "xdiff/xutils.h" struct xdiff_emit_state {
Signature · 1 line
gitgitgadget
PATCH v2 3/12 archive.h: remove unnecessary include
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need.
Signed-off-by Elijah Newren <[email protected]>
--- archive-tar.c | 1 + archive-zip.c | 1 + archive.c | 1 + archive.h | 1 - 4 files changed, 3 insertions(+), 1 deletion(-)
archive-tar.c +1 -0
@@ -9,6 +9,7 @@#include "tar.h" #include "archive.h" #include "object-store-ll.h" +#include "strbuf.h" #include "streaming.h" #include "run-command.h" #include "write-or-die.h"
archive-zip.c +1 -0
@@ -10,6 +10,7 @@#include "streaming.h" #include "utf8.h" #include "object-store-ll.h" +#include "strbuf.h" #include "userdiff.h" #include "write-or-die.h" #include "xdiff-interface.h"
archive.c +1 -0
@@ -5,6 +5,7 @@#include "environment.h" #include "gettext.h" #include "hex.h" +#include "object-name.h" #include "path.h" #include "pretty.h" #include "setup.h"
archive.h +0 -1
@@ -1,7 +1,6 @@#ifndef ARCHIVE_H #define ARCHIVE_H -#include "object-name.h" #include "pathspec.h" #include "string-list.h"
Signature · 1 line
gitgitgadget
PATCH v2 4/12 blame.h: remove unnecessary includes
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need.
Signed-off-by Elijah Newren <[email protected]>
--- blame.c | 2 ++ blame.h | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-)
blame.c +2 -0
@@ -3,6 +3,7 @@#include "object-store-ll.h" #include "cache-tree.h" #include "mergesort.h" +#include "commit.h" #include "convert.h" #include "diff.h" #include "diffcore.h"
@@ -10,6 +11,7 @@#include "hex.h" #include "path.h" #include "read-cache.h" +#include "revision.h" #include "setup.h" #include "tag.h" #include "trace2.h"
blame.h +0 -3
@@ -1,12 +1,9 @@#ifndef BLAME_H #define BLAME_H -#include "commit.h" #include "oidset.h" #include "xdiff-interface.h" -#include "revision.h" #include "prio-queue.h" -#include "diff.h" #define PICKAXE_BLAME_MOVE 01#define PICKAXE_BLAME_COPY 02
Signature · 1 line
gitgitgadget
PATCH v2 5/12 fsmonitor--daemon.h: remove unnecessary includes
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need.
Signed-off-by Elijah Newren <[email protected]>
--- builtin/fsmonitor--daemon.c | 2 ++ compat/fsmonitor/fsm-health-win32.c | 1 + compat/fsmonitor/fsm-listen-darwin.c | 1 + compat/fsmonitor/fsm-listen-win32.c | 1 + fsmonitor--daemon.h | 4 +--- 5 files changed, 6 insertions(+), 3 deletions(-)
builtin/fsmonitor--daemon.c +2 -0
@@ -1,6 +1,7 @@#include "builtin.h" #include "abspath.h" #include "config.h" +#include "dir.h" #include "environment.h" #include "gettext.h" #include "parse-options.h"
@@ -14,6 +15,7 @@#include "simple-ipc.h" #include "khash.h" #include "pkt-line.h" +#include "run-command.h" #include "trace.h" #include "trace2.h"
compat/fsmonitor/fsm-health-win32.c +1 -0
@@ -4,6 +4,7 @@#include "fsm-health.h" #include "fsmonitor--daemon.h" #include "gettext.h" +#include "simple-ipc.h" /* * Every minute wake up and test our health.
compat/fsmonitor/fsm-listen-darwin.c +1 -0
@@ -29,6 +29,7 @@#include "fsmonitor--daemon.h" #include "fsmonitor-path-utils.h" #include "gettext.h" +#include "simple-ipc.h" #include "string-list.h" #include "trace.h"
compat/fsmonitor/fsm-listen-win32.c +1 -0
@@ -4,6 +4,7 @@#include "fsm-listen.h" #include "fsmonitor--daemon.h" #include "gettext.h" +#include "simple-ipc.h" #include "trace2.h" /*
fsmonitor--daemon.h +1 -3
@@ -3,9 +3,7 @@#ifdef HAVE_FSMONITOR_DAEMON_BACKEND -#include "dir.h" -#include "run-command.h" -#include "simple-ipc.h" +#include "hashmap.h" #include "thread-utils.h" #include "fsmonitor-path-utils.h"
Signature · 1 line
gitgitgadget
PATCH v2 6/12 http.h: remove unnecessary include
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need.
Signed-off-by Elijah Newren <[email protected]>
--- http-fetch.c | 1 + http-push.c | 1 + http.h | 1 - remote-curl.c | 1 + 4 files changed, 3 insertions(+), 1 deletion(-)
http-fetch.c +1 -0
@@ -6,6 +6,7 @@#include "walker.h" #include "setup.h" #include "strvec.h" +#include "url.h" #include "urlmatch.h" #include "trace2.h"
http-push.c +1 -0
@@ -15,6 +15,7 @@#include "strvec.h" #include "tree.h" #include "tree-walk.h" +#include "url.h" #include "packfile.h" #include "object-store-ll.h" #include "commit-reach.h"
http.h +0 -1
@@ -10,7 +10,6 @@ struct packed_git;#include "strbuf.h" #include "remote.h" -#include "url.h" #define DEFAULT_MAX_REQUESTS 5
remote-curl.c +1 -0
@@ -21,6 +21,7 @@#include "quote.h" #include "trace2.h" #include "transport.h" +#include "url.h" #include "write-or-die.h" static struct remote *remote;
Signature · 1 line
gitgitgadget
PATCH v2 7/12 line-log.h: remove unnecessary include
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need.
Signed-off-by Elijah Newren <[email protected]>
--- line-log.c | 1 + line-log.h | 2 -- log-tree.c | 1 + 3 files changed, 2 insertions(+), 2 deletions(-)
line-log.c +1 -0
@@ -1,4 +1,5 @@#include "git-compat-util.h" +#include "diffcore.h" #include "line-range.h" #include "hex.h" #include "tag.h"
line-log.h +0 -2
@@ -1,8 +1,6 @@#ifndef LINE_LOG_H #define LINE_LOG_H -#include "diffcore.h" -struct rev_info ;struct commit ;struct string_list ;
log-tree.c +1 -0
@@ -2,6 +2,7 @@#include "commit-reach.h" #include "config.h" #include "diff.h" +#include "diffcore.h" #include "environment.h" #include "hex.h" #include "object-name.h"
Signature · 1 line
gitgitgadget
PATCH v2 8/12 pkt-line.h: remove unnecessary include
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need.
Signed-off-by Elijah Newren <[email protected]>
--- pkt-line.c | 1 + pkt-line.h | 1 - t/helper/test-pkt-line.c | 1 + 3 files changed, 2 insertions(+), 1 deletion(-)
pkt-line.c +1 -0
@@ -4,6 +4,7 @@#include "gettext.h" #include "hex.h" #include "run-command.h" +#include "sideband.h" #include "trace.h" #include "write-or-die.h"
pkt-line.h +0 -1
@@ -2,7 +2,6 @@#define PKTLINE_H #include "strbuf.h" -#include "sideband.h" /* * Write a packetized stream, where each line is preceded by
t/helper/test-pkt-line.c +1 -0
@@ -1,6 +1,7 @@#include "git-compat-util.h" #include "test-tool.h" #include "pkt-line.h" +#include "sideband.h" #include "write-or-die.h" static void pack_line (const char *line)
Signature · 1 line
gitgitgadget
PATCH v2 9/12 submodule-config.h: remove unnecessary include
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need.
Signed-off-by Elijah Newren <[email protected]>
--- submodule-config.h | 1 - t/helper/test-submodule.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)
submodule-config.h +0 -1
@@ -3,7 +3,6 @@#include "config.h" #include "submodule.h" -#include "strbuf.h" #include "tree-walk.h" /**
t/helper/test-submodule.c +1 -0
@@ -4,6 +4,7 @@#include "remote.h" #include "repository.h" #include "setup.h" +#include "strbuf.h" #include "submodule-config.h" #include "submodule.h"
Signature · 1 line
gitgitgadget
PATCH v2 10/12 trace2/tr2_tls.h: remove unnecessary include
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need.
Signed-off-by Elijah Newren <[email protected]>
--- trace2/tr2_tgt_normal.c | 1 + trace2/tr2_tls.c | 1 + trace2/tr2_tls.h | 1 - 3 files changed, 2 insertions(+), 1 deletion(-)
trace2/tr2_tgt_normal.c +1 -0
@@ -2,6 +2,7 @@#include "config.h" #include "repository.h" #include "run-command.h" +#include "strbuf.h" #include "quote.h" #include "version.h" #include "trace2/tr2_dst.h"
trace2/tr2_tls.c +1 -0
@@ -1,4 +1,5 @@#include "git-compat-util.h" +#include "strbuf.h" #include "thread-utils.h" #include "trace.h" #include "trace2/tr2_tls.h"
trace2/tr2_tls.h +0 -1
@@ -1,7 +1,6 @@#ifndef TR2_TLS_H #define TR2_TLS_H -#include "strbuf.h" #include "trace2/tr2_ctr.h" #include "trace2/tr2_tmr.h"
Signature · 1 line
gitgitgadget
PATCH v2 11/12 treewide: add direct includes currently only pulled in transitively
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
The next commit will remove a bunch of unnecessary includes, but to do so, we need some of the lower level direct includes that files rely on to be explicitly specified.
Signed-off-by Elijah Newren <[email protected]>
--- builtin/commit-graph.c | 1 + builtin/for-each-ref.c | 1 + builtin/fsmonitor--daemon.c | 1 + commit-graph.c | 1 + 4 files changed, 4 insertions(+)
builtin/commit-graph.c +1 -0
@@ -11,6 +11,7 @@#include "object-store-ll.h" #include "progress.h" #include "replace-object.h" +#include "strbuf.h" #include "tag.h" #include "trace2.h"
builtin/for-each-ref.c +1 -0
@@ -1,4 +1,5 @@#include "builtin.h" +#include "commit.h" #include "config.h" #include "gettext.h" #include "object.h"
builtin/fsmonitor--daemon.c +1 -0
@@ -12,6 +12,7 @@#include "compat/fsmonitor/fsm-health.h" #include "compat/fsmonitor/fsm-listen.h" #include "fsmonitor--daemon.h" +#include "repository.h" #include "simple-ipc.h" #include "khash.h" #include "pkt-line.h"
commit-graph.c +1 -0
@@ -1,5 +1,6 @@#include "git-compat-util.h" #include "config.h" +#include "csum-file.h" #include "gettext.h" #include "hex.h" #include "lockfile.h"
Signature · 1 line
gitgitgadget
PATCH v2 12/12 treewide: remove unnecessary includes in source files
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
Signed-off-by Elijah Newren <[email protected]>
--- builtin/archive.c | 1 - builtin/commit-graph.c | 1 - builtin/fsck.c | 1 - builtin/fsmonitor--daemon.c | 2 -- builtin/grep.c | 1 - builtin/mktag.c | 1 - builtin/rev-list.c | 1 - builtin/send-pack.c | 1 - commit-graph.c | 1 - compat/simple-ipc/ipc-shared.c | 3 --- compat/simple-ipc/ipc-unix-socket.c | 1 - fsmonitor-ipc.c | 1 - http.c | 1 - line-log.c | 1 - merge-ort.c | 1 - notes-utils.c | 1 - ref-filter.c | 1 - remote-curl.c | 1 - repo-settings.c | 1 - t/helper/test-repository.c | 1 - trace2/tr2_ctr.c | 1 - trace2/tr2_tmr.c | 1 - 22 files changed, 25 deletions(-)
builtin/archive.c +0 -1
@@ -9,7 +9,6 @@#include "parse-options.h" #include "pkt-line.h" #include "repository.h" -#include "sideband.h" static void create_output_file (const char *output_file) {
builtin/commit-graph.c +0 -1
@@ -4,7 +4,6 @@#include "environment.h" #include "gettext.h" #include "hex.h" -#include "lockfile.h" #include "parse-options.h" #include "repository.h" #include "commit-graph.h"
builtin/fsck.c +0 -1
@@ -10,7 +10,6 @@#include "refs.h" #include "pack.h" #include "cache-tree.h" -#include "tree-walk.h" #include "fsck.h" #include "parse-options.h" #include "progress.h"
builtin/fsmonitor--daemon.c +0 -2
@@ -7,7 +7,6 @@#include "parse-options.h" #include "fsmonitor-ll.h" #include "fsmonitor-ipc.h" -#include "fsmonitor-path-utils.h" #include "fsmonitor-settings.h" #include "compat/fsmonitor/fsm-health.h" #include "compat/fsmonitor/fsm-listen.h"
@@ -15,7 +14,6 @@#include "repository.h" #include "simple-ipc.h" #include "khash.h" -#include "pkt-line.h" #include "run-command.h" #include "trace.h" #include "trace2.h"
builtin/grep.c +0 -1
@@ -14,7 +14,6 @@#include "parse-options.h" #include "string-list.h" #include "run-command.h" -#include "userdiff.h" #include "grep.h" #include "quote.h" #include "dir.h"
builtin/mktag.c +0 -1
@@ -3,7 +3,6 @@#include "hex.h" #include "parse-options.h" #include "strbuf.h" -#include "tag.h" #include "replace-object.h" #include "object-file.h" #include "object-store-ll.h"
builtin/rev-list.c +0 -1
@@ -12,7 +12,6 @@#include "object-name.h" #include "object-file.h" #include "object-store-ll.h" -#include "pack.h" #include "pack-bitmap.h" #include "log-tree.h" #include "graph.h"
builtin/send-pack.c +0 -1
@@ -2,7 +2,6 @@#include "config.h" #include "hex.h" #include "pkt-line.h" -#include "sideband.h" #include "run-command.h" #include "remote.h" #include "connect.h"
commit-graph.c +0 -1
@@ -4,7 +4,6 @@#include "gettext.h" #include "hex.h" #include "lockfile.h" -#include "pack.h" #include "packfile.h" #include "commit.h" #include "object.h"
compat/simple-ipc/ipc-shared.c +0 -3
@@ -1,8 +1,5 @@#include "git-compat-util.h" #include "simple-ipc.h" -#include "strbuf.h" -#include "pkt-line.h" -#include "thread-utils.h" #ifndef SUPPORTS_SIMPLE_IPC /*
compat/simple-ipc/ipc-unix-socket.c +0 -1
@@ -2,7 +2,6 @@#include "gettext.h" #include "simple-ipc.h" #include "strbuf.h" -#include "pkt-line.h" #include "thread-utils.h" #include "trace2.h" #include "unix-socket.h"
fsmonitor-ipc.c +0 -1
@@ -1,5 +1,4 @@#include "git-compat-util.h" -#include "fsmonitor-ll.h" #include "gettext.h" #include "simple-ipc.h" #include "fsmonitor-ipc.h"
http.c +0 -1
@@ -4,7 +4,6 @@#include "http.h" #include "config.h" #include "pack.h" -#include "sideband.h" #include "run-command.h" #include "url.h" #include "urlmatch.h"
line-log.c +0 -1
@@ -12,7 +12,6 @@#include "xdiff-interface.h" #include "strbuf.h" #include "log-tree.h" -#include "userdiff.h" #include "line-log.h" #include "setup.h" #include "strvec.h"
merge-ort.c +0 -1
@@ -41,7 +41,6 @@#include "revision.h" #include "sparse-index.h" #include "strmap.h" -#include "submodule.h" #include "trace2.h" #include "tree.h" #include "unpack-trees.h"
notes-utils.c +0 -1
@@ -5,7 +5,6 @@#include "gettext.h" #include "refs.h" #include "notes-utils.h" -#include "repository.h" #include "strbuf.h" void create_notes_commit(struct repository *r,
ref-filter.c +0 -1
@@ -29,7 +29,6 @@#include "commit-reach.h" #include "worktree.h" #include "hashmap.h" -#include "strvec.h" static struct ref_msg { const char *gone;
remote-curl.c +0 -1
@@ -11,7 +11,6 @@#include "run-command.h" #include "pkt-line.h" #include "string-list.h" -#include "sideband.h" #include "strvec.h" #include "credential.h" #include "oid-array.h"
repo-settings.c +0 -1
@@ -2,7 +2,6 @@#include "config.h" #include "repository.h" #include "midx.h" -#include "compat/fsmonitor/fsm-listen.h" static void repo_cfg_bool (struct repository *r,const char *key,int *dest,int def)
t/helper/test-repository.c +0 -1
@@ -3,7 +3,6 @@#include "commit.h" #include "environment.h" #include "hex.h" -#include "object-store-ll.h" #include "object.h" #include "repository.h" #include "setup.h"
trace2/tr2_ctr.c +0 -1
@@ -1,5 +1,4 @@#include "git-compat-util.h" -#include "thread-utils.h" #include "trace2/tr2_tgt.h" #include "trace2/tr2_tls.h" #include "trace2/tr2_ctr.h"
trace2/tr2_tmr.c +0 -1
@@ -1,5 +1,4 @@#include "git-compat-util.h" -#include "thread-utils.h" #include "trace2/tr2_tgt.h" #include "trace2/tr2_tls.h" #include "trace2/tr2_tmr.h"
Signature · 1 line
gitgitgadget