[PATCH 1/4] Header Includes Cleanup Part 2
From: Nathaniel P Dawson <hidden>
Date: 2016-06-15 22:46:31
Subsystem:
the rest · Maintainer:
Linus Torvalds
Deleted header includes of cache.h, strbuf.h, and remote.h where http.h is already included since it includes them. Also deleted a couple includes I missed during part 1. Signed-off-by: Nathaniel P Dawson <redacted> --- builtin-rev-parse.c | 4 +--- contrib/convert-objects/convert-objects.c | 1 - http-push.c | 4 +--- http-walker.c | 3 +-- http.h | 1 - 5 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c
index 81d5a6f..dc0a9ab 100644
--- a/builtin-rev-parse.c
+++ b/builtin-rev-parse.c@@ -3,11 +3,9 @@ * * Copyright (C) Linus Torvalds, 2005 */ -#include "cache.h" -#include "commit.h" +#include "builtin.h" #include "refs.h" #include "quote.h" -#include "builtin.h" #include "parse-options.h" #define DO_REVS 1
diff --git a/contrib/convert-objects/convert-objects.c b/contrib/convert-objects/convert-objects.c
index 90e7900..99a7cfd 100644
--- a/contrib/convert-objects/convert-objects.c
+++ b/contrib/convert-objects/convert-objects.c@@ -1,7 +1,6 @@ #include "cache.h" #include "blob.h" #include "commit.h" -#include "tree.h" struct entry { unsigned char old_sha1[20];
diff --git a/http-push.c b/http-push.c
index 6ce5a1d..97b2e68 100644
--- a/http-push.c
+++ b/http-push.c@@ -1,14 +1,12 @@ -#include "cache.h" +#include "http.h" #include "commit.h" #include "pack.h" #include "tag.h" #include "blob.h" -#include "http.h" #include "refs.h" #include "diff.h" #include "revision.h" #include "exec_cmd.h" -#include "remote.h" #include "list-objects.h" #include "sigchain.h"
diff --git a/http-walker.c b/http-walker.c
index 0dbad3c..6ecd754 100644
--- a/http-walker.c
+++ b/http-walker.c@@ -1,8 +1,7 @@ -#include "cache.h" +#include "http.h" #include "commit.h" #include "pack.h" #include "walker.h" -#include "http.h" #define PREV_BUF_SIZE 4096 #define RANGE_HEADER_SIZE 30
diff --git a/http.h b/http.h
index 905b462..e424356 100644
--- a/http.h
+++ b/http.h@@ -6,7 +6,6 @@ #include <curl/curl.h> #include <curl/easy.h> -#include "strbuf.h" #include "remote.h" /*
--
1.6.1.3