[PATCH 3/5] Header includes cleanup
Deleted header includes of git-compat-util.h, strbuf.h, hash.h where cache.h was included since cache.h includes them.
Signed-off-by: Nathaniel P Dawson <nathaniel.dawson@gmail.com>
---
builtin-clone.c | 1 -
builtin-remote.c | 1 -
connect.c | 1 -
diffcore-rename.c | 1 -
editor.c | 1 -
hash.c | 1 -
parse-options.c | 3 +--
shell.c | 1 -
test-delta.c | 3 +--
9 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/builtin-clone.c b/builtin-clone.c
index 0031b5f..50cb6ba 100644
--- a/builtin-clone.c
+++ b/builtin-clone.c
@@ -16,7 +16,6 @@
#include "tree-walk.h"
#include "unpack-trees.h"
#include "transport.h"
-#include "strbuf.h"
#include "dir.h"
#include "pack-refs.h"
#include "sigchain.h"
diff --git a/builtin-remote.c b/builtin-remote.c
index 9ef846f..5bf8042 100644
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -3,7 +3,6 @@
#include "transport.h"
#include "remote.h"
#include "string-list.h"
-#include "strbuf.h"
#include "run-command.h"
#include "refs.h"
diff --git a/connect.c b/connect.c
index 7636bf9..12a5c2b 100644
--- a/connect.c
+++ b/connect.c
@@ -1,4 +1,3 @@
-#include "git-compat-util.h"
#include "cache.h"
#include "pkt-line.h"
#include "quote.h"
diff --git a/diffcore-rename.c b/diffcore-rename.c
index 0b0d6b8..00e1ce1 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -4,7 +4,6 @@
#include "cache.h"
#include "diff.h"
#include "diffcore.h"
-#include "hash.h"
/* Table of rename/copy destinations */
diff --git a/editor.c b/editor.c
index 4d469d0..22fd4c0 100644
--- a/editor.c
+++ b/editor.c
@@ -1,5 +1,4 @@
#include "cache.h"
-#include "strbuf.h"
#include "run-command.h"
int launch_editor(const char *path, struct strbuf *buffer, const char *const *env)
diff --git a/hash.c b/hash.c
index 1cd4c9d..5a68fdf 100644
--- a/hash.c
+++ b/hash.c
@@ -2,7 +2,6 @@
* Some generic hashing helpers.
*/
#include "cache.h"
-#include "hash.h"
/*
* Look up a hash entry in the hash table. Return the pointer to
diff --git a/parse-options.c b/parse-options.c
index cf71bcf..bafeeea 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -1,6 +1,5 @@
-#include "git-compat-util.h"
-#include "parse-options.h"
#include "cache.h"
+#include "parse-options.h"
#include "commit.h"
#define OPT_SHORT 1
diff --git a/shell.c b/shell.c
index e339369..37c52c2 100644
--- a/shell.c
+++ b/shell.c
@@ -1,7 +1,6 @@
#include "cache.h"
#include "quote.h"
#include "exec_cmd.h"
-#include "strbuf.h"
static int do_generic_cmd(const char *me, char *arg)
{
diff --git a/test-delta.c b/test-delta.c
index 3d885ff..3d90611 100644
--- a/test-delta.c
+++ b/test-delta.c
@@ -8,9 +8,8 @@
* published by the Free Software Foundation.
*/
-#include "git-compat-util.h"
-#include "delta.h"
#include "cache.h"
+#include "delta.h"
static const char usage_str[] =
"test-delta (-d|-p) <from_file> <data_file> <out_file>";
--
1.6.1.3