aboutsummaryrefslogtreecommitdiffstats
path: root/trace.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-04-25 13:56:19 -0700
committerJunio C Hamano <gitster@pobox.com>2023-04-25 13:56:20 -0700
commit0807e57807aaffe2813fffb7704dcc9153f03832 (patch)
treec6a5e764ff9a3e24c7b054ade453c161c2c4b2e5 /trace.c
parent9ce9dea4e1c2419cca126d29fa7730baa078a11b (diff)
parent331b094eec6d4c937af6e59df2a537112e4d8205 (diff)
downloadgit-0807e57807aaffe2813fffb7704dcc9153f03832.tar.gz
Merge branch 'en/header-split-cache-h'
Header clean-up. * en/header-split-cache-h: (24 commits) protocol.h: move definition of DEFAULT_GIT_PORT from cache.h mailmap, quote: move declarations of global vars to correct unit treewide: reduce includes of cache.h in other headers treewide: remove double forward declaration of read_in_full cache.h: remove unnecessary includes treewide: remove cache.h inclusion due to pager.h changes pager.h: move declarations for pager.c functions from cache.h treewide: remove cache.h inclusion due to editor.h changes editor: move editor-related functions and declarations into common file treewide: remove cache.h inclusion due to object.h changes object.h: move some inline functions and defines from cache.h treewide: remove cache.h inclusion due to object-file.h changes object-file.h: move declarations for object-file.c functions from cache.h treewide: remove cache.h inclusion due to git-zlib changes git-zlib: move declarations for git-zlib functions from cache.h treewide: remove cache.h inclusion due to object-name.h changes object-name.h: move declarations for object-name.c functions from cache.h treewide: remove unnecessary cache.h inclusion treewide: be explicit about dependence on mem-pool.h treewide: be explicit about dependence on oid-array.h ...
Diffstat (limited to 'trace.c')
-rw-r--r--trace.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/trace.c b/trace.c
index 81318a2455..592c141d78 100644
--- a/trace.c
+++ b/trace.c
@@ -21,11 +21,12 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "cache.h"
+#include "git-compat-util.h"
#include "abspath.h"
#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 };