csum-file.h: remove unnecessary inclusion of cache.h

With the change in the last commit to move several functions to
write-or-die.h, csum-file.h no longer needs to include cache.h.
However, removing that include forces several other C files, which
directly or indirectly dependend upon csum-file.h's inclusion of
cache.h, to now be more explicit about their dependencies.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/bulk-checkin.c b/bulk-checkin.c
index eb6d7a2805b066c80d199833291afaa23c1d71c9..d2428b86111ac8d846c2b582ad3c4d9d0f415b08 100644 (file)
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2011, Google Inc.
  */
-#include "git-compat-util.h"
+#include "cache.h"
 #include "alloc.h"
 #include "bulk-checkin.h"
 #include "environment.h"

diff --git a/chunk-format.c b/chunk-format.c
index 6d1071729df60715519f6c3ff6a011c13f83fd20..60a73c1b1403a67a551057509b54f2e92d32568b 100644 (file)
--- a/chunk-format.c
+++ b/chunk-format.c
@@ -3,6 +3,7 @@
 #include "chunk-format.h"
 #include "csum-file.h"
 #include "gettext.h"
+#include "trace2.h"
 
 /*
  * When writing a chunk-based file format, collect the chunks in

diff --git a/commit-graph.c b/commit-graph.c
index 5481736c76c399b7f592db4e2af870f0db7acac9..f0cd2e7a2a3db13f4820735e667008d8c68439bf 100644 (file)
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -1,4 +1,4 @@
-#include "git-compat-util.h"
+#include "cache.h"
 #include "config.h"
 #include "gettext.h"
 #include "hex.h"

diff --git a/csum-file.h b/csum-file.h
index 4cd9014e367ed6959dfc7393975dc5d9c6ba7960..566e05cbd25a04be9977356e3cfb5a77637bf4c8 100644 (file)
--- a/csum-file.h
+++ b/csum-file.h
@@ -1,7 +1,6 @@
 #ifndef CSUM_FILE_H
 #define CSUM_FILE_H
 
-#include "cache.h"
 #include "hash.h"
 #include "write-or-die.h"
 

diff --git a/delta-islands.c b/delta-islands.c
index 1222b6a6cd1995c516e3ae85d90d1f748848ef23..73a01179e8333a88d7509f93539480a141a4f3ba 100644 (file)
--- a/delta-islands.c
+++ b/delta-islands.c
@@ -1,4 +1,4 @@
-#include "git-compat-util.h"
+#include "cache.h"
 #include "alloc.h"
 #include "attr.h"
 #include "object.h"

diff --git a/fetch-pack.c b/fetch-pack.c
index c453a4168f9f9df601c77a417cf87f4b15e3dade..10f759532cef5157877c21799644d7e93f9db4ec 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -1,4 +1,4 @@
-#include "git-compat-util.h"
+#include "cache.h"
 #include "alloc.h"
 #include "repository.h"
 #include "config.h"

diff --git a/midx.c b/midx.c
index b111665dcab39c696bea2f30abbabdef5c6b5e21..9af3e5de8899cda69ab885c74bfd0e2b72f53bdb 100644 (file)
--- a/midx.c
+++ b/midx.c
@@ -1,4 +1,4 @@
-#include "git-compat-util.h"
+#include "cache.h"
 #include "abspath.h"
 #include "alloc.h"
 #include "config.h"

diff --git a/object-file.c b/object-file.c
index 05fff230f73990ec3d5452ada2a09ecadd844aea..397596e3c8f57a3d3f7066c4a72be4d10c446199 100644 (file)
--- a/object-file.c
+++ b/object-file.c
@@ -6,7 +6,7 @@
  * This handles basic git object files - packing, unpacking,
  * creation etc.
  */
-#include "git-compat-util.h"
+#include "cache.h"
 #include "abspath.h"
 #include "alloc.h"
 #include "config.h"

diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index 63f16080c9b47b86a92996874b2d6a428dcf9359..0fddeb1298bf5556114c536e55fbe25e3a2c6bc5 100644 (file)
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -1,4 +1,4 @@
-#include "git-compat-util.h"
+#include "cache.h"
 #include "alloc.h"
 #include "environment.h"
 #include "gettext.h"
@@ -17,6 +17,7 @@
 #include "pack-objects.h"
 #include "commit-reach.h"
 #include "prio-queue.h"
+#include "trace2.h"
 
 struct bitmapped_commit {
        struct commit *commit;

diff --git a/pack-bitmap.c b/pack-bitmap.c
index 241ac9166c1b304fe6df44ea351b25896efb83fe..23d87e71bd9ee553daf2a9df723ecd0fb32a1d91 100644 (file)
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -1,4 +1,4 @@
-#include "git-compat-util.h"
+#include "cache.h"
 #include "alloc.h"
 #include "commit.h"
 #include "gettext.h"

diff --git a/pack.h b/pack.h
index 01d385903adcba22f46633aec3f7c2fff78776f3..3ab9e3f60c0b0341c3cb37e9026bdc217ba6aa97 100644 (file)
--- a/pack.h
+++ b/pack.h
@@ -4,6 +4,8 @@
 #include "object.h"
 #include "csum-file.h"
 
+struct packed_git;
+struct pack_window;
 struct repository;
 
 /*

diff --git a/packfile.c b/packfile.c
index 4b5b841d04687678aee4014e647a2d44ecd25428..61672d50bdfae1c53a28a46fbde113d59e9de8bf 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -1,4 +1,4 @@
-#include "git-compat-util.h"
+#include "cache.h"
 #include "alloc.h"
 #include "environment.h"
 #include "gettext.h"