treewide: be explicit about dependence on trace.h & trace2.h
Dozens of files made use of trace and trace2 functions, without explicitly including trace.h or trace2.h. This made it more difficult to find which files could remove a dependence on cache.h. Make C files explicitly include trace.h or trace2.h if they are using them. Signed-off-by: Elijah Newren <newren@gmail.com> Acked-by: Calvin Wan <calvinwan@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Apr 11, 2023 at 03:00 UTC
74ea5c9574d29a510602492fcd672e5d09c841b0
62 files changed
+70
-2
blame.c
+1
index 62db980764..3455f6a5ea 100644
--- a/blame.c
+++ b/blame.c
@@ -9,6 +9,7 @@
#include "hex.h"
#include "setup.h"
#include "tag.h"
+#include "trace2.h"
#include "blame.h"
#include "alloc.h"
#include "commit-slab.h"
builtin/checkout.c
+1
index 38a8cd6a96..422ea76840 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -26,6 +26,7 @@
#include "setup.h"
#include "submodule.h"
#include "submodule-config.h"
+#include "trace2.h"
#include "tree.h"
#include "tree-walk.h"
#include "unpack-trees.h"
builtin/commit-graph.c
+1
index 9011426976..a3d00fa232 100644
--- a/builtin/commit-graph.c
+++ b/builtin/commit-graph.c
@@ -12,6 +12,7 @@
#include "progress.h"
#include "replace-object.h"
#include "tag.h"
+#include "trace2.h"
#define BUILTIN_COMMIT_GRAPH_VERIFY_USAGE \
N_("git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]")
builtin/fetch.c
+2
index 6a6a58d49c..ffe0e21459 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -31,6 +31,8 @@
#include "promisor-remote.h"
#include "commit-graph.h"
#include "shallow.h"
+#include "trace.h"
+#include "trace2.h"
#include "worktree.h"
#include "bundle-uri.h"
builtin/fsmonitor--daemon.c
+1
index a280d8bb14..df876b41d6 100644
--- a/builtin/fsmonitor--daemon.c
+++ b/builtin/fsmonitor--daemon.c
@@ -14,6 +14,7 @@
#include "simple-ipc.h"
#include "khash.h"
#include "pkt-line.h"
+#include "trace2.h"
static const char * const builtin_fsmonitor__daemon_usage[] = {
N_("git fsmonitor--daemon start [<options>]"),
builtin/gc.c
+1
index b291e23b13..000a2ef5e1 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -37,6 +37,7 @@
#include "gettext.h"
#include "hook.h"
#include "setup.h"
+#include "trace2.h"
#include "wrapper.h"
#define FAILED_RUN "failed to run %s"
builtin/push.c
+1
index fa550b8f80..a99ba38a36 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -16,6 +16,7 @@
#include "submodule.h"
#include "submodule-config.h"
#include "send-pack.h"
+#include "trace2.h"
#include "color.h"
static const char * const push_usage[] = {
builtin/rebase.c
+1
index dbc8f90ef0..fb859f93a3 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -32,6 +32,7 @@
#include "sequencer.h"
#include "rebase-interactive.h"
#include "reset.h"
+#include "trace2.h"
#include "hook.h"
#include "wrapper.h"
builtin/receive-pack.c
+2
index 2ba5a74ba7..aa5b6fe861 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -32,6 +32,8 @@
#include "object-store.h"
#include "protocol.h"
#include "commit-reach.h"
+#include "trace.h"
+#include "trace2.h"
#include "worktree.h"
#include "shallow.h"
#include "wrapper.h"
builtin/reset.c
+2
index 0ed329236c..4d639ec6b3 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -29,6 +29,8 @@
#include "setup.h"
#include "submodule.h"
#include "submodule-config.h"
+#include "trace.h"
+#include "trace2.h"
#include "dir.h"
#include "add-interactive.h"
cache-tree.c
+2
index ff14b527da..39f0c74472 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -11,6 +11,8 @@
#include "replace-object.h"
#include "promisor-remote.h"
#include "sparse-index.h"
+#include "trace.h"
+#include "trace2.h"
#ifndef DEBUG_CACHE_TREE
#define DEBUG_CACHE_TREE 0
cache.h
-2
index 82d7b112b4..c8ae80fded 100644
--- a/cache.h
+++ b/cache.h
@@ -8,8 +8,6 @@
#include "advice.h"
#include "gettext.h"
#include "convert.h"
-#include "trace.h"
-#include "trace2.h"
#include "string-list.h"
#include "pack-revindex.h"
#include "hash.h"
chdir-notify.c
+1
index 929ec01b3a..8e38cd6f3a 100644
--- a/chdir-notify.c
+++ b/chdir-notify.c
@@ -3,6 +3,7 @@
#include "chdir-notify.h"
#include "list.h"
#include "strbuf.h"
+#include "trace.h"
struct chdir_notify_entry {
const char *name;
common-main.c
+1
index b83cb5cf06..f319317353 100644
--- a/common-main.c
+++ b/common-main.c
@@ -3,6 +3,7 @@
#include "gettext.h"
#include "attr.h"
#include "setup.h"
+#include "trace2.h"
/*
* Many parts of Git have subprograms communicate via pipe, expect the
compat/fsmonitor/fsm-listen-win32.c
+1
index 7b07b74ba5..677b1bbdec 100644
--- a/compat/fsmonitor/fsm-listen-win32.c
+++ b/compat/fsmonitor/fsm-listen-win32.c
@@ -4,6 +4,7 @@
#include "fsm-listen.h"
#include "fsmonitor--daemon.h"
#include "gettext.h"
+#include "trace2.h"
/*
* The documentation of ReadDirectoryChangesW() states that the maximum
compat/mingw.c
+1
index 94c5a1daa4..abbc3faf32 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -12,6 +12,7 @@
#include "win32/lazyload.h"
#include "../config.h"
#include "../environment.h"
+#include "../trace2.h"
#include "../wrapper.h"
#include "dir.h"
#include "gettext.h"
compat/simple-ipc/ipc-unix-socket.c
+1
index 152db60a31..7064475b39 100644
--- a/compat/simple-ipc/ipc-unix-socket.c
+++ b/compat/simple-ipc/ipc-unix-socket.c
@@ -4,6 +4,7 @@
#include "strbuf.h"
#include "pkt-line.h"
#include "thread-utils.h"
+#include "trace2.h"
#include "unix-socket.h"
#include "unix-stream-server.h"
compat/simple-ipc/ipc-win32.c
+2
index 997f614434..6adce3c650 100644
--- a/compat/simple-ipc/ipc-win32.c
+++ b/compat/simple-ipc/ipc-win32.c
@@ -5,6 +5,8 @@
#include "strbuf.h"
#include "pkt-line.h"
#include "thread-utils.h"
+#include "trace.h"
+#include "trace2.h"
#include "accctrl.h"
#include "aclapi.h"
compat/win32/trace2_win32_process_info.c
+1
index a53fd92434..e3e895c78a 100644
--- a/compat/win32/trace2_win32_process_info.c
+++ b/compat/win32/trace2_win32_process_info.c
@@ -1,5 +1,6 @@
#include "../../cache.h"
#include "../../json-writer.h"
+#include "../../trace2.h"
#include "lazyload.h"
#include <Psapi.h>
#include <tlHelp32.h>
config.c
+1
index 5ad9ae9143..e5c2e47731 100644
--- a/config.c
+++ b/config.c
@@ -28,6 +28,7 @@
#include "replace-object.h"
#include "refs.h"
#include "setup.h"
+#include "trace2.h"
#include "worktree.h"
#include "wrapper.h"
#include "write-or-die.h"
connect.c
+1
index 737dd906f7..929f72ec5d 100644
--- a/connect.c
+++ b/connect.c
@@ -14,6 +14,7 @@
#include "string-list.h"
#include "oid-array.h"
#include "transport.h"
+#include "trace2.h"
#include "strbuf.h"
#include "version.h"
#include "protocol.h"
convert.c
+1
index da06e2f51c..126036ec33 100644
--- a/convert.c
+++ b/convert.c
@@ -9,6 +9,7 @@
#include "sigchain.h"
#include "pkt-line.h"
#include "sub-process.h"
+#include "trace.h"
#include "utf8.h"
#include "ll-merge.h"
#include "wrapper.h"
diff-lib.c
+1
index 4169dd8cb1..8b5cca96ac 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -13,6 +13,7 @@
#include "unpack-trees.h"
#include "refs.h"
#include "submodule.h"
+#include "trace.h"
#include "dir.h"
#include "fsmonitor.h"
#include "commit-reach.h"
dir.c
+1
index 18fd14c46b..10f6c38b93 100644
--- a/dir.c
+++ b/dir.c
@@ -23,6 +23,7 @@
#include "fsmonitor.h"
#include "setup.h"
#include "submodule-config.h"
+#include "trace2.h"
#include "wrapper.h"
/*
environment.c
+1
index 63c697e7e9..2254595e4a 100644
--- a/environment.c
+++ b/environment.c
@@ -24,6 +24,7 @@
#include "chdir-notify.h"
#include "setup.h"
#include "shallow.h"
+#include "trace.h"
#include "wrapper.h"
#include "write-or-die.h"
exec-cmd.c
+2
index fae0d4b244..6f61846389 100644
--- a/exec-cmd.c
+++ b/exec-cmd.c
@@ -5,6 +5,8 @@
#include "gettext.h"
#include "quote.h"
#include "strvec.h"
+#include "trace.h"
+#include "trace2.h"
#if defined(RUNTIME_PREFIX)
fetch-pack.c
+1
index 368f2ed25a..7d4f190fb1 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -17,6 +17,7 @@
#include "remote.h"
#include "run-command.h"
#include "connect.h"
+#include "trace2.h"
#include "transport.h"
#include "version.h"
#include "oid-array.h"
fsmonitor.c
+1
index c956a347a2..28c083d4d8 100644
--- a/fsmonitor.c
+++ b/fsmonitor.c
@@ -7,6 +7,7 @@
#include "fsmonitor-ipc.h"
#include "run-command.h"
#include "strbuf.h"
+#include "trace2.h"
#define INDEX_EXTENSION_VERSION1 (1)
#define INDEX_EXTENSION_VERSION2 (2)
fsmonitor.h
+1
index edf7ce5203..67faf592e1 100644
--- a/fsmonitor.h
+++ b/fsmonitor.h
@@ -4,6 +4,7 @@
#include "cache.h"
#include "dir.h"
#include "fsmonitor-settings.h"
+#include "trace.h"
extern struct trace_key trace_fsmonitor;
git.c
+2
index 77f920a6f6..d2bb86e0d3 100644
--- a/git.c
+++ b/git.c
@@ -9,6 +9,8 @@
#include "replace-object.h"
#include "setup.h"
#include "shallow.h"
+#include "trace.h"
+#include "trace2.h"
#define RUN_SETUP (1<<0)
#define RUN_SETUP_GENTLY (1<<1)
http.c
+1
index dbe4d29ef7..0212c0ad3b 100644
--- a/http.c
+++ b/http.c
@@ -12,6 +12,7 @@
#include "version.h"
#include "pkt-line.h"
#include "gettext.h"
+#include "trace.h"
#include "transport.h"
#include "packfile.h"
#include "protocol.h"
merge-ort.c
+1
index 5bf64354d1..ad7367179d 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -37,6 +37,7 @@
#include "strmap.h"
#include "submodule-config.h"
#include "submodule.h"
+#include "trace2.h"
#include "tree.h"
#include "unpack-trees.h"
#include "xdiff-interface.h"
name-hash.c
+1
index 2c2861efd1..fb13716e43 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -9,6 +9,7 @@
#include "environment.h"
#include "gettext.h"
#include "thread-utils.h"
+#include "trace.h"
#include "trace2.h"
#include "sparse-index.h"
notes-merge.c
+1
index c40107c3aa..19405ec71a 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -13,6 +13,7 @@
#include "notes.h"
#include "notes-merge.h"
#include "strbuf.h"
+#include "trace.h"
#include "notes-utils.h"
#include "commit-reach.h"
#include "wrapper.h"
pack-bitmap.c
+1
index 23d87e71bd..eba838d24e 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -15,6 +15,7 @@
#include "pack-objects.h"
#include "packfile.h"
#include "repository.h"
+#include "trace2.h"
#include "object-store.h"
#include "list-objects-filter-options.h"
#include "midx.h"
pack-revindex.c
+1
index 03c7e81f9d..9f9927d947 100644
--- a/pack-revindex.c
+++ b/pack-revindex.c
@@ -3,6 +3,7 @@
#include "pack-revindex.h"
#include "object-store.h"
#include "packfile.h"
+#include "trace2.h"
#include "config.h"
#include "midx.h"
packfile.c
+1
index b120405ccc..2d3dabb1ae 100644
--- a/packfile.c
+++ b/packfile.c
@@ -15,6 +15,7 @@
#include "commit.h"
#include "object.h"
#include "tag.h"
+#include "trace.h"
#include "tree-walk.h"
#include "tree.h"
#include "object-store.h"
pkt-line.c
+1
index 36ae0fea4a..3561d85358 100644
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -3,6 +3,7 @@
#include "gettext.h"
#include "hex.h"
#include "run-command.h"
+#include "trace.h"
#include "wrapper.h"
#include "write-or-die.h"
preload-index.c
+1
index 52544d004e..4abf9c983b 100644
--- a/preload-index.c
+++ b/preload-index.c
@@ -11,6 +11,7 @@
#include "progress.h"
#include "thread-utils.h"
#include "repository.h"
+#include "trace2.h"
/*
* Mostly randomly chosen maximum thread counts: we
progress.c
+1
index 44c784d75f..c5c8514737 100644
--- a/progress.c
+++ b/progress.c
@@ -13,6 +13,7 @@
#include "progress.h"
#include "strbuf.h"
#include "trace.h"
+#include "trace2.h"
#include "utf8.h"
#include "config.h"
promisor-remote.c
+1
index a8dbb788e8..9d83d2f4b9 100644
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@ -4,6 +4,7 @@
#include "object-store.h"
#include "promisor-remote.h"
#include "config.h"
+#include "trace2.h"
#include "transport.h"
#include "strvec.h"
#include "packfile.h"
protocol.c
+1
index bdb32e1eeb..4d8eb887e8 100644
--- a/protocol.c
+++ b/protocol.c
@@ -2,6 +2,7 @@
#include "config.h"
#include "environment.h"
#include "protocol.h"
+#include "trace2.h"
static enum protocol_version parse_protocol_version(const char *value)
{
read-cache.c
+1
index e5e7216904..a744eb89e4 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -23,6 +23,7 @@
#include "resolve-undo.h"
#include "run-command.h"
#include "strbuf.h"
+#include "trace2.h"
#include "varint.h"
#include "split-index.h"
#include "utf8.h"
remote-curl.c
+1
index 0f2410da8e..0ada1dd802 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -21,6 +21,7 @@
#include "setup.h"
#include "protocol.h"
#include "quote.h"
+#include "trace2.h"
#include "transport.h"
#include "write-or-die.h"
repository.c
+1
index f6d9f5db08..c53e480e32 100644
--- a/repository.c
+++ b/repository.c
@@ -14,6 +14,7 @@
#include "setup.h"
#include "submodule-config.h"
#include "sparse-index.h"
+#include "trace2.h"
#include "promisor-remote.h"
/* The main repository */
revision.c
+1
index cd3e841433..7c34c93885 100644
--- a/revision.c
+++ b/revision.c
@@ -31,6 +31,7 @@
#include "worktree.h"
#include "setup.h"
#include "strvec.h"
+#include "trace2.h"
#include "commit-reach.h"
#include "commit-graph.h"
#include "prio-queue.h"
run-command.c
+2
index 614d48fa9a..e64bb08a5b 100644
--- a/run-command.c
+++ b/run-command.c
@@ -8,6 +8,8 @@
#include "thread-utils.h"
#include "strbuf.h"
#include "string-list.h"
+#include "trace.h"
+#include "trace2.h"
#include "quote.h"
#include "config.h"
#include "packfile.h"
scalar.c
+1
index 27635658c0..f7680463e1 100644
--- a/scalar.c
+++ b/scalar.c
@@ -16,6 +16,7 @@
#include "packfile.h"
#include "help.h"
#include "setup.h"
+#include "trace2.h"
static void setup_enlistment_directory(int argc, const char **argv,
const char * const *usagestr,
setup.c
+1
index 6c5b85e96c..3bb7a9fff6 100644
--- a/setup.c
+++ b/setup.c
@@ -10,6 +10,7 @@
#include "chdir-notify.h"
#include "promisor-remote.h"
#include "quote.h"
+#include "trace2.h"
static int inside_git_dir = -1;
static int inside_work_tree = -1;
shallow.c
+1
index b4d726bd59..128f56179e 100644
--- a/shallow.c
+++ b/shallow.c
@@ -17,6 +17,7 @@
#include "list-objects.h"
#include "commit-reach.h"
#include "shallow.h"
+#include "trace.h"
#include "wrapper.h"
void set_alternate_shallow_file(struct repository *r, const char *path, int override)
submodule.c
+1
index d7d0a8a083..58c9d5e567 100644
--- a/submodule.c
+++ b/submodule.c
@@ -28,6 +28,7 @@
#include "commit-reach.h"
#include "setup.h"
#include "shallow.h"
+#include "trace2.h"
static int config_update_recurse_submodules = RECURSE_SUBMODULES_OFF;
static int initialized_fetch_ref_tips;
t/helper/test-date.c
+1
index 45951b1df8..a01eec99f3 100644
--- a/t/helper/test-date.c
+++ b/t/helper/test-date.c
@@ -1,6 +1,7 @@
#include "test-tool.h"
#include "cache.h"
#include "date.h"
+#include "trace.h"
static const char *usage_msg = "\n"
" test-tool date relative [time_t]...\n"
t/helper/test-lazy-init-name-hash.c
+1
index 06ce3a47cc..f23d983c11 100644
--- a/t/helper/test-lazy-init-name-hash.c
+++ b/t/helper/test-lazy-init-name-hash.c
@@ -4,6 +4,7 @@
#include "environment.h"
#include "parse-options.h"
#include "setup.h"
+#include "trace.h"
static int single;
static int multi;
t/helper/test-path-utils.c
+1
index 4f5ac2fadc..6355c9e4b6 100644
--- a/t/helper/test-path-utils.c
+++ b/t/helper/test-path-utils.c
@@ -4,6 +4,7 @@
#include "environment.h"
#include "setup.h"
#include "string-list.h"
+#include "trace.h"
#include "utf8.h"
/*
trace.c
+1
index 81318a2455..d8eaa0a786 100644
--- a/trace.c
+++ b/trace.c
@@ -26,6 +26,7 @@
#include "environment.h"
#include "quote.h"
#include "setup.h"
+#include "trace.h"
#include "wrapper.h"
struct trace_key trace_default_key = { "GIT_TRACE", 0, 0, 0 };
trace2.c
+1
index e8ba62c0c3..21264df71b 100644
--- a/trace2.c
+++ b/trace2.c
@@ -7,6 +7,7 @@
#include "thread-utils.h"
#include "version.h"
#include "trace.h"
+#include "trace2.h"
#include "trace2/tr2_cfg.h"
#include "trace2/tr2_cmd_name.h"
#include "trace2/tr2_ctr.h"
transport.c
+1
index d2a1af43b5..11b38d16dc 100644
--- a/transport.c
+++ b/transport.c
@@ -22,6 +22,7 @@
#include "string-list.h"
#include "oid-array.h"
#include "sigchain.h"
+#include "trace2.h"
#include "transport-internal.h"
#include "protocol.h"
#include "object-store.h"
tree-walk.c
+1
index 38b6556478..59add24c8e 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -5,6 +5,7 @@
#include "gettext.h"
#include "hex.h"
#include "object-store.h"
+#include "trace2.h"
#include "tree.h"
#include "pathspec.h"
#include "json-writer.h"
unpack-trees.c
+1
index 4a5522bdb2..d41489b4ad 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -17,6 +17,7 @@
#include "sparse-index.h"
#include "submodule.h"
#include "submodule-config.h"
+#include "trace2.h"
#include "fsmonitor.h"
#include "object-store.h"
#include "promisor-remote.h"
upload-pack.c
+1
index e23f16dfdd..71440c6380 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -22,6 +22,7 @@
#include "version.h"
#include "string-list.h"
#include "strvec.h"
+#include "trace2.h"
#include "prio-queue.h"
#include "protocol.h"
#include "quote.h"
wrapper.c
+1
index ee83757590..c130d7518b 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -5,6 +5,7 @@
#include "abspath.h"
#include "config.h"
#include "gettext.h"
+#include "trace2.h"
#include "wrapper.h"
static intmax_t count_fsync_writeout_only;
wt-status.c
+2
index 4bef09de1c..ccbfd9cc6d 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -18,6 +18,8 @@
#include "column.h"
#include "setup.h"
#include "strbuf.h"
+#include "trace.h"
+#include "trace2.h"
#include "utf8.h"
#include "worktree.h"
#include "lockfile.h"