[PATCH 0/4] Header Includes Cleanup Part 2
Here is part 2 of this project; I expect another 2 parts before completion.
Regards, Nathaniel P Dawson
threads / patch / 18656
patch, 4 partsHeader Includes Cleanup Part 2
Subject: [PATCH 1/4] Header Includes Cleanup Part 2
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 <nathaniel.dawson@gmail.com> --- 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(-)
Show changes to 5 files +3 −10
builtin-rev-parse.c, contrib/convert-objects/convert-objects.c, http-push.c, http-walker.c, http.h
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
[PATCH 2/4] Header Includes Cleanup Part 2
Deleted includes of revision.h where log-tree.h was included since log-tree.h includes it.
Signed-off-by: Nathaniel P Dawson <nathaniel.dawson@gmail.com> --- builtin-commit.c | 3 +-- builtin-diff.c | 1 - builtin-fast-export.c | 1 - builtin-log.c | 1 - builtin-merge.c | 3 +-- builtin-rev-list.c | 3 +-- diff-no-index.c | 1 - pretty.c | 3 +-- revision.c | 3 +-- 9 files changed, 5 insertions(+), 14 deletions(-)
Show changes to 9 files +5 −14
builtin-commit.c, builtin-diff.c, builtin-fast-export.c, builtin-log.c, builtin-merge.c, builtin-rev-list.c, diff-no-index.c, pretty.c, revision.c
diff --git a/builtin-commit.c b/builtin-commit.c index aba5660..0e21313 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -11,11 +11,10 @@ #include "dir.h" #include "diff.h" #include "diffcore.h" -#include "revision.h" +#include "log-tree.h" #include "wt-status.h" #include "run-command.h" #include "refs.h" -#include "log-tree.h" #include "utf8.h" #include "parse-options.h" #include "string-list.h" diff --git a/builtin-diff.c b/builtin-diff.c index 252c519..50239a9 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -9,7 +9,6 @@ #include "tag.h" #include "diff.h" #include "diffcore.h" -#include "revision.h" #include "log-tree.h" struct blobinfo { diff --git a/builtin-fast-export.c b/builtin-fast-export.c index b62e48d..e1aa036 100644 --- a/builtin-fast-export.c +++ b/builtin-fast-export.c @@ -9,7 +9,6 @@ #include "diff.h" #include "diffcore.h" #include "log-tree.h" -#include "revision.h" #include "decorate.h" #include "string-list.h" #include "utf8.h" diff --git a/builtin-log.c b/builtin-log.c index 5105c91..db7c344 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -7,7 +7,6 @@ #include "builtin.h" #include "color.h" #include "diff.h" -#include "revision.h" #include "log-tree.h" #include "tag.h" #include "reflog-walk.h" diff --git a/builtin-merge.c b/builtin-merge.c index cb4c645..fb6e61a 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -12,12 +12,11 @@ #include "diff.h" #include "refs.h" #include "diffcore.h" -#include "revision.h" +#include "log-tree.h" #include "unpack-trees.h" #include "cache-tree.h" #include "dir.h" #include "utf8.h" -#include "log-tree.h" #include "color.h" #include "rerere.h" #include "help.h" diff --git a/builtin-rev-list.c b/builtin-rev-list.c index cedfe9a..faac425 100644 --- a/builtin-rev-list.c +++ b/builtin-rev-list.c @@ -4,9 +4,8 @@ #include "tag.h" #include "tree.h" #include "diff.h" -#include "revision.h" -#include "list-objects.h" #include "log-tree.h" +#include "list-objects.h" #include "graph.h" /* bits #0-15 in revision.h */ diff --git a/diff-no-index.c b/diff-no-index.c index cb68b8d..fa8b669 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -10,7 +10,6 @@ #include "tag.h" #include "diff.h" #include "diffcore.h" -#include "revision.h" #include "log-tree.h" #include "string-list.h" diff --git a/pretty.c b/pretty.c index efa7024..0465de1 100644 --- a/pretty.c +++ b/pretty.c @@ -2,10 +2,9 @@ #include "commit.h" #include "utf8.h" #include "diff.h" -#include "revision.h" +#include "log-tree.h" #include "string-list.h" #include "mailmap.h" -#include "log-tree.h" #include "color.h" static char *user_format; diff --git a/revision.c b/revision.c index 827108d..18425d6 100644 --- a/revision.c +++ b/revision.c @@ -4,12 +4,11 @@ #include "commit.h" #include "diff.h" #include "refs.h" -#include "revision.h" +#include "log-tree.h" #include "graph.h" #include "grep.h" #include "reflog-walk.h" #include "patch-ids.h" -#include "log-tree.h" volatile show_early_output_fn_t show_early_output;
-- 1.6.1.3
[PATCH 3/4] Header Includes Cleanup Part 2
Deleted includes of string-list.h where merge-recursive.h was included since it includes string-list.h.
Signed-off-by: Nathaniel P Dawson <nathaniel.dawson@gmail.com> --- merge-recursive.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
Show changes to merge-recursive.c +1 −2
diff --git a/merge-recursive.c b/merge-recursive.c index 370151e..40d636f 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -10,11 +10,10 @@ #include "diffcore.h" #include "tag.h" #include "unpack-trees.h" -#include "string-list.h" +#include "merge-recursive.h" #include "xdiff-interface.h" #include "ll-merge.h" #include "attr.h" -#include "merge-recursive.h" #include "dir.h" static struct tree *shift_tree_object(struct tree *one, struct tree *two)
-- 1.6.1.3
[PATCH 4/4] Header Includes Cleanup Part 2
Deleted includes of cache.h where reflog-walk.h was included since reflog-walk.h includes it.
Signed-off-by: Nathaniel P Dawson <nathaniel.dawson@gmail.com> --- log-tree.c | 3 +-- reflog-walk.c | 3 +-- revision.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-)
Show changes to 3 files +3 −6
log-tree.c, reflog-walk.c, revision.c
diff --git a/log-tree.c b/log-tree.c index 9565c18..0433e61 100644 --- a/log-tree.c +++ b/log-tree.c @@ -1,10 +1,9 @@ -#include "cache.h" +#include "reflog-walk.h" #include "diff.h" #include "commit.h" #include "tag.h" #include "graph.h" #include "log-tree.h" -#include "reflog-walk.h" #include "refs.h" #include "string-list.h" diff --git a/reflog-walk.c b/reflog-walk.c index fd065f4..9198500 100644 --- a/reflog-walk.c +++ b/reflog-walk.c @@ -1,10 +1,9 @@ -#include "cache.h" +#include "reflog-walk.h" #include "commit.h" #include "refs.h" #include "diff.h" #include "revision.h" #include "string-list.h" -#include "reflog-walk.h" struct complete_reflogs { char *ref; diff --git a/revision.c b/revision.c index 18425d6..b9d2aed 100644 --- a/revision.c +++ b/revision.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "reflog-walk.h" #include "tag.h" #include "blob.h" #include "commit.h" @@ -7,7 +7,6 @@ #include "log-tree.h" #include "graph.h" #include "grep.h" -#include "reflog-walk.h" #include "patch-ids.h" volatile show_early_output_fn_t show_early_output;
-- 1.6.1.3