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>

diff --git a/blame.c b/blame.c
index 62db9807640e1b8ed08a3142008ee01714d711f6..3455f6a5ea35153dd30cc21073784a177e78bcfa 100644 (file)
--- 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"

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 38a8cd6a965210b3959043c3e228a3d84ba93ab1..422ea7684043def812dc57b0e43cfb496534beed 100644 (file)
--- 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"

diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index 901142697612feb7354e87049d44048411fbcd13..a3d00fa232b51a0ed6581a2638ca65bf50db3023 100644 (file)
--- 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]")

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 6a6a58d49c955d39ec34e4583d916428ceda4d85..ffe0e2145929f1810db21f96fc9be5137336523c 100644 (file)
--- 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"
 

diff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c
index a280d8bb14fad4686820d662b68d167a3e4927cd..df876b41d6560c6bc2b29b2332102d0d778f5d6b 100644 (file)
--- 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>]"),

diff --git a/builtin/gc.c b/builtin/gc.c
index b291e23b13d6dff88b042689a778ea8962b3bb9e..000a2ef5e11f9c420dee2ed8e365937227bf0809 100644 (file)
--- 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"

diff --git a/builtin/push.c b/builtin/push.c
index fa550b8f80ad4e3d8da1f15fbf98ba8ac6858d03..a99ba38a36874bf31f5a44930a515c6e73cedf0d 100644 (file)
--- 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[] = {

diff --git a/builtin/rebase.c b/builtin/rebase.c
index dbc8f90ef0426b448c2b00403338e068e8982781..fb859f93a303e4cc9ad92e0ff9d5a6811764c885 100644 (file)
--- 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"
 

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 2ba5a74ba7b6f524b02af948d4ebcd3442daeaca..aa5b6fe861f496195f34e77ad9871756f2598845 100644 (file)
--- 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"

diff --git a/builtin/reset.c b/builtin/reset.c
index 0ed329236c88e3f92692d5c3b6d2c69064bdb242..4d639ec6b3764df78acef83ffee47ff678d21650 100644 (file)
--- 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"
 

diff --git a/cache-tree.c b/cache-tree.c
index ff14b527da38acc6968d88df65a1e1ebfd854b5b..39f0c74472724142c9c2748d71faa4d377ea0719 100644 (file)
--- 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

diff --git a/cache.h b/cache.h
index 82d7b112b4e71cc2d707f637178841a327217584..c8ae80fded35d77308333fa209bb719c83e54be2 100644 (file)
--- 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"

diff --git a/chdir-notify.c b/chdir-notify.c
index 929ec01b3a24435f56380f9497064ecc405c375f..8e38cd6f3aea9c456f809a6fdf51b10eefaaa925 100644 (file)
--- 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;

diff --git a/common-main.c b/common-main.c
index b83cb5cf066732be125e8a5912d56405fed741d3..f319317353584348ec476111b7560d0b55c5d825 100644 (file)
--- 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

diff --git a/compat/fsmonitor/fsm-listen-win32.c b/compat/fsmonitor/fsm-listen-win32.c
index 7b07b74ba5bd0d20f504f1d5b1e3e5d6dd3e4c21..677b1bbdecac2e82b03c3755af4dfa0de562f73d 100644 (file)
--- 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

diff --git a/compat/mingw.c b/compat/mingw.c
index 94c5a1daa40cde53093b62f0c2c3c67da12ffd9e..abbc3faf32f428bc75edaa311ef8cb3d6cd8ab7a 100644 (file)
--- 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"

diff --git a/compat/simple-ipc/ipc-unix-socket.c b/compat/simple-ipc/ipc-unix-socket.c
index 152db60a311c2784ab5c90a346769a2785ca8cac..7064475b39f3376e16d123a4bcb6d861c0ee80c6 100644 (file)
--- 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"
 

diff --git a/compat/simple-ipc/ipc-win32.c b/compat/simple-ipc/ipc-win32.c
index 997f6144344d883584b2991f2684ff383a7c9e55..6adce3c650eba5b8ae4879b5c32b79c3849c3d95 100644 (file)
--- 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"
 

diff --git a/compat/win32/trace2_win32_process_info.c b/compat/win32/trace2_win32_process_info.c
index a53fd924340f7d6da04e5197363fe831b9d19bf3..e3e895c78a2206b07e8cd5040926491228b49563 100644 (file)
--- 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>

diff --git a/config.c b/config.c
index 5ad9ae914366f68e092c60c4b2ff86d14b6fea27..e5c2e4773197cff8f8592d1188adf5fe880810bc 100644 (file)
--- 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"

diff --git a/connect.c b/connect.c
index 737dd906f729e51d030292ea229aafa32c90d825..929f72ec5d7b62b52752e16507f2955b97f70371 100644 (file)
--- 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"

diff --git a/convert.c b/convert.c
index da06e2f51cb0ff83b989106c32e94b5921de496c..126036ec330f9c63f5dd5965e9cce12acd455e74 100644 (file)
--- 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 --git a/diff-lib.c b/diff-lib.c
index 4169dd8cb1329a55c7f47674ed694293185f0b2a..8b5cca96aceb2f08a429b6d4516f9e8625608adf 100644 (file)
--- 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"

diff --git a/dir.c b/dir.c
index 18fd14c46b2f61ea300b2f26e864a0c929ad8c88..10f6c38b93041cd6ba88bfa2495d31fb8bc71a8e 100644 (file)
--- 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"
 
 /*

diff --git a/environment.c b/environment.c
index 63c697e7e97cca35e52df3847bb017713f6940ef..2254595e4a8cc4526d6711c36c6238c9ded527d3 100644 (file)
--- 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"
 

diff --git a/exec-cmd.c b/exec-cmd.c
index fae0d4b244a9d37cafb8f984311b0259bf702898..6f618463896b6e840dd2620bdbd36877192854df 100644 (file)
--- 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)
 

diff --git a/fetch-pack.c b/fetch-pack.c
index 368f2ed25a1c40f6ab55f0b1098a8722ce930c18..7d4f190fb1d9335db121f8dfbf60e46ff284da7a 100644 (file)
--- 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"

diff --git a/fsmonitor.c b/fsmonitor.c
index c956a347a27a8a907deaba3030f8a725f030e3f3..28c083d4d8417404bcf4efca872ac1106cf4a925 100644 (file)
--- 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)

diff --git a/fsmonitor.h b/fsmonitor.h
index edf7ce5203b1a850e26c4b81cdb565350cd7f748..67faf592e1277a30c5ea517a58961430d6cea350 100644 (file)
--- 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;
 

diff --git a/git.c b/git.c
index 77f920a6f6fcf997b583505fd29277acb00f8524..d2bb86e0d3260f6ee7f75f9b3677ea19a82cfd45 100644 (file)
--- 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)

diff --git a/http.c b/http.c
index dbe4d29ef7abb87bf4a9cba21558745975ac795f..0212c0ad3b2b778eb28ed42c966d82d8e2a6a669 100644 (file)
--- 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"

diff --git a/merge-ort.c b/merge-ort.c
index 5bf64354d168e3577b43ceca2ee25f8cc957f1de..ad7367179d9b4900403cec0a665539e47c2956cf 100644 (file)
--- 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"

diff --git a/name-hash.c b/name-hash.c
index 2c2861efd1cf3b3cc0b56fb40f531ac467213b46..fb13716e4303ebc7c96caa49934ca67f61ae772e 100644 (file)
--- 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"
 

diff --git a/notes-merge.c b/notes-merge.c
index c40107c3aa027218f0acd10f69a162049c88fca2..19405ec71ac5237738d4088ef718fddaccc02b21 100644 (file)
--- 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"

diff --git a/pack-bitmap.c b/pack-bitmap.c
index 23d87e71bd9ee553daf2a9df723ecd0fb32a1d91..eba838d24ee95a02a14a6c21cc711d151003e677 100644 (file)
--- 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"

diff --git a/pack-revindex.c b/pack-revindex.c
index 03c7e81f9da61602f22185d20bcb5121ba7fc97b..9f9927d9471784fca23208299e9af80b647c80ed 100644 (file)
--- 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"
 

diff --git a/packfile.c b/packfile.c
index b120405ccc8a6bf591ddd7e8b9410f2305a88306..2d3dabb1aeefbe184a51cd6541d7047e454c7f51 100644 (file)
--- 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"

diff --git a/pkt-line.c b/pkt-line.c
index 36ae0fea4a3c6ba06899d6248fb2c2a7578b378d..3561d853584ecd1611acfe2358cfaa7adb9b5cd2 100644 (file)
--- 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"
 

diff --git a/preload-index.c b/preload-index.c
index 52544d004e76a011e5078fbc14037bd74a039553..4abf9c983b28df9718415e675c1c1fa0946ebfa4 100644 (file)
--- 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

diff --git a/progress.c b/progress.c
index 44c784d75f106c066c85b7a7a6569744332a6be2..c5c8514737a054cda0c1f879e63773164c1b46ea 100644 (file)
--- 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"
 

diff --git a/promisor-remote.c b/promisor-remote.c
index a8dbb788e8f1a0a4cb3c77ba16fda20bb8b9f41a..9d83d2f4b9cfff754ddcdee29e3496e707325404 100644 (file)
--- 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"

diff --git a/protocol.c b/protocol.c
index bdb32e1eeb62473b9ae309b266c7f508a480c354..4d8eb887e824a8452016135267067c30719799c8 100644 (file)
--- 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)
 {

diff --git a/read-cache.c b/read-cache.c
index e5e72169047ebccd98e04bebfa5dd29877aa7c98..a744eb89e4e638df8a3e44891576672a1ccd7c4f 100644 (file)
--- 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"

diff --git a/remote-curl.c b/remote-curl.c
index 0f2410da8e7eed233117034c2d2f5fc7ccf54304..0ada1dd80264532df27405e6617600a5eabb8d79 100644 (file)
--- 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"
 

diff --git a/repository.c b/repository.c
index f6d9f5db08e0ded1390f1ba0d081585cab6b52a3..c53e480e32601e0ba4ba63ea9ba31accde57a46b 100644 (file)
--- 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 */

diff --git a/revision.c b/revision.c
index cd3e841433a5755290f3c22f4d350c5750255076..7c34c93885e9c301be0d695bfc8fbf70147a3e90 100644 (file)
--- 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"

diff --git a/run-command.c b/run-command.c
index 614d48fa9a231e4192485d2b1bc75fae91542845..e64bb08a5bf890b1afddfede3519536a714debec 100644 (file)
--- 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"

diff --git a/scalar.c b/scalar.c
index 27635658c01c8204c8f53c659da262f858c4e3dd..f7680463e1bcc92413ef935eb81d55725a4618bc 100644 (file)
--- 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,

diff --git a/setup.c b/setup.c
index 6c5b85e96c1e6bfc5367ec54d068d5d61f329aec..3bb7a9fff62770fc74df31dde6e675384bfc02b8 100644 (file)
--- 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;

diff --git a/shallow.c b/shallow.c
index b4d726bd5954c4cbf4156c9ea8c98822471c9db4..128f56179edefa7d223508217e5c73aa427e647b 100644 (file)
--- 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)

diff --git a/submodule.c b/submodule.c
index d7d0a8a083406487ca5d78cf3e1afb1d4b16cdf9..58c9d5e56730e8762f826ece985516a0de2cb1f3 100644 (file)
--- 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;

diff --git a/t/helper/test-date.c b/t/helper/test-date.c
index 45951b1df87c7bf90a25cc1497344681ae42a161..a01eec99f351a9cd51cfff4e772dfead6e2fbba8 100644 (file)
--- 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"

diff --git a/t/helper/test-lazy-init-name-hash.c b/t/helper/test-lazy-init-name-hash.c
index 06ce3a47ccfbfd3e33bb6bbacf796253c3da365f..f23d983c1188b4962b3b0df0da5ff5679cd52863 100644 (file)
--- 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;

diff --git a/t/helper/test-path-utils.c b/t/helper/test-path-utils.c
index 4f5ac2fadce3d940241c7f8b3fc529bc3318ec71..6355c9e4b6df1b6def6c61556e0609fb3656ef17 100644 (file)
--- 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"
 
 /*

diff --git a/trace.c b/trace.c
index 81318a2455df4c9c3c0725bdd31314788cee4a17..d8eaa0a786ab38a7265093cf2c3e954dae139d42 100644 (file)
--- 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 };

diff --git a/trace2.c b/trace2.c
index e8ba62c0c3dc8293bd973f7d5c39d024f5eb85f7..21264df71b79bd3672011ed79c0ad61d93671e7e 100644 (file)
--- 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"

diff --git a/transport.c b/transport.c
index d2a1af43b5c30edb8139b867d8ad81568ec30690..11b38d16dcfa8e42227b52351942a5d3fc2ba5f5 100644 (file)
--- 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"

diff --git a/tree-walk.c b/tree-walk.c
index 38b6556478d037b67422e44e49453a7de60d7c9f..59add24c8e920cef4bdfbff56c132b172a029fb0 100644 (file)
--- 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"

diff --git a/unpack-trees.c b/unpack-trees.c
index 4a5522bdb26fcf1f09b73aeab805d0dc416fe533..d41489b4adb68f26a6141b7b86d41f08945b28ae 100644 (file)
--- 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"

diff --git a/upload-pack.c b/upload-pack.c
index e23f16dfdd220036f3b5bb93d24d8c1b4e7f4b96..71440c638068087787de0f002ebfc25c784a615b 100644 (file)
--- 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"

diff --git a/wrapper.c b/wrapper.c
index ee83757590269f063a83c9c89cbd1b64ae22c044..c130d7518bf489aa2aa20cbf07b15a00d0b99489 100644 (file)
--- 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;

diff --git a/wt-status.c b/wt-status.c
index 4bef09de1ca55adc2046dafe4df8d0aa93b9d37f..ccbfd9cc6de020e8a5fd329cd224d194d0acb5f2 100644 (file)
--- 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"