{"thread":{"id":"18656","subject":"[PATCH 1/4] Header Includes Cleanup Part 2","startedAt":"2009-03-31T09:45:17Z","lastAt":"2009-03-31T09:45:21Z","messageCount":5,"participants":["Nathaniel P Dawson"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"109990","messageId":"1238492721-92484-1-git-send-email-nathaniel.dawson@gmail.com","threadId":"18656","inReplyTo":null,"subject":"[PATCH 0/4] Header Includes Cleanup Part 2","fromName":"Nathaniel P Dawson","fromEmail":"nathaniel.dawson@gmail.com","sentAt":"2009-03-31T09:45:17Z","receivedAt":"2009-03-31T09:45:17Z","isPatch":true,"sender":{"key":"nathaniel.dawson@gmail.com","avatar":null},"body":"Here is part 2 of this project; I expect another 2 parts before\ncompletion.\n\nRegards,\nNathaniel P Dawson\n"},{"id":"109989","messageId":"1238492721-92484-2-git-send-email-nathaniel.dawson@gmail.com","threadId":"18656","inReplyTo":"1238492721-92484-1-git-send-email-nathaniel.dawson@gmail.com","subject":"[PATCH 1/4] Header Includes Cleanup Part 2","fromName":"Nathaniel P Dawson","fromEmail":"nathaniel.dawson@gmail.com","sentAt":"2009-03-31T09:45:18Z","receivedAt":"2009-03-31T09:45:18Z","isPatch":true,"sender":{"key":"nathaniel.dawson@gmail.com","avatar":null},"body":"Deleted header includes of cache.h, strbuf.h, and remote.h where\nhttp.h is already included since it includes them.\n\nAlso deleted a couple includes I missed during part 1.\n\nSigned-off-by: Nathaniel P Dawson <nathaniel.dawson@gmail.com>\n---\n builtin-rev-parse.c                       |    4 +---\n contrib/convert-objects/convert-objects.c |    1 -\n http-push.c                               |    4 +---\n http-walker.c                             |    3 +--\n http.h                                    |    1 -\n 5 files changed, 3 insertions(+), 10 deletions(-)\n\ndiff --git a/builtin-rev-parse.c b/builtin-rev-parse.c\nindex 81d5a6f..dc0a9ab 100644\n--- a/builtin-rev-parse.c\n+++ b/builtin-rev-parse.c\n@@ -3,11 +3,9 @@\n  *\n  * Copyright (C) Linus Torvalds, 2005\n  */\n-#include \"cache.h\"\n-#include \"commit.h\"\n+#include \"builtin.h\"\n #include \"refs.h\"\n #include \"quote.h\"\n-#include \"builtin.h\"\n #include \"parse-options.h\"\n \n #define DO_REVS\t\t1\ndiff --git a/contrib/convert-objects/convert-objects.c b/contrib/convert-objects/convert-objects.c\nindex 90e7900..99a7cfd 100644\n--- a/contrib/convert-objects/convert-objects.c\n+++ b/contrib/convert-objects/convert-objects.c\n@@ -1,7 +1,6 @@\n #include \"cache.h\"\n #include \"blob.h\"\n #include \"commit.h\"\n-#include \"tree.h\"\n \n struct entry {\n \tunsigned char old_sha1[20];\ndiff --git a/http-push.c b/http-push.c\nindex 6ce5a1d..97b2e68 100644\n--- a/http-push.c\n+++ b/http-push.c\n@@ -1,14 +1,12 @@\n-#include \"cache.h\"\n+#include \"http.h\"\n #include \"commit.h\"\n #include \"pack.h\"\n #include \"tag.h\"\n #include \"blob.h\"\n-#include \"http.h\"\n #include \"refs.h\"\n #include \"diff.h\"\n #include \"revision.h\"\n #include \"exec_cmd.h\"\n-#include \"remote.h\"\n #include \"list-objects.h\"\n #include \"sigchain.h\"\n \ndiff --git a/http-walker.c b/http-walker.c\nindex 0dbad3c..6ecd754 100644\n--- a/http-walker.c\n+++ b/http-walker.c\n@@ -1,8 +1,7 @@\n-#include \"cache.h\"\n+#include \"http.h\"\n #include \"commit.h\"\n #include \"pack.h\"\n #include \"walker.h\"\n-#include \"http.h\"\n \n #define PREV_BUF_SIZE 4096\n #define RANGE_HEADER_SIZE 30\ndiff --git a/http.h b/http.h\nindex 905b462..e424356 100644\n--- a/http.h\n+++ b/http.h\n@@ -6,7 +6,6 @@\n #include <curl/curl.h>\n #include <curl/easy.h>\n \n-#include \"strbuf.h\"\n #include \"remote.h\"\n \n /*\n-- \n1.6.1.3\n"},{"id":"109991","messageId":"1238492721-92484-3-git-send-email-nathaniel.dawson@gmail.com","threadId":"18656","inReplyTo":"1238492721-92484-2-git-send-email-nathaniel.dawson@gmail.com","subject":"[PATCH 2/4] Header Includes Cleanup Part 2","fromName":"Nathaniel P Dawson","fromEmail":"nathaniel.dawson@gmail.com","sentAt":"2009-03-31T09:45:19Z","receivedAt":"2009-03-31T09:45:19Z","isPatch":true,"sender":{"key":"nathaniel.dawson@gmail.com","avatar":null},"body":"Deleted includes of revision.h where log-tree.h was included since\nlog-tree.h includes it.\n\nSigned-off-by: Nathaniel P Dawson <nathaniel.dawson@gmail.com>\n---\n builtin-commit.c      |    3 +--\n builtin-diff.c        |    1 -\n builtin-fast-export.c |    1 -\n builtin-log.c         |    1 -\n builtin-merge.c       |    3 +--\n builtin-rev-list.c    |    3 +--\n diff-no-index.c       |    1 -\n pretty.c              |    3 +--\n revision.c            |    3 +--\n 9 files changed, 5 insertions(+), 14 deletions(-)\n\ndiff --git a/builtin-commit.c b/builtin-commit.c\nindex aba5660..0e21313 100644\n--- a/builtin-commit.c\n+++ b/builtin-commit.c\n@@ -11,11 +11,10 @@\n #include \"dir.h\"\n #include \"diff.h\"\n #include \"diffcore.h\"\n-#include \"revision.h\"\n+#include \"log-tree.h\"\n #include \"wt-status.h\"\n #include \"run-command.h\"\n #include \"refs.h\"\n-#include \"log-tree.h\"\n #include \"utf8.h\"\n #include \"parse-options.h\"\n #include \"string-list.h\"\ndiff --git a/builtin-diff.c b/builtin-diff.c\nindex 252c519..50239a9 100644\n--- a/builtin-diff.c\n+++ b/builtin-diff.c\n@@ -9,7 +9,6 @@\n #include \"tag.h\"\n #include \"diff.h\"\n #include \"diffcore.h\"\n-#include \"revision.h\"\n #include \"log-tree.h\"\n \n struct blobinfo {\ndiff --git a/builtin-fast-export.c b/builtin-fast-export.c\nindex b62e48d..e1aa036 100644\n--- a/builtin-fast-export.c\n+++ b/builtin-fast-export.c\n@@ -9,7 +9,6 @@\n #include \"diff.h\"\n #include \"diffcore.h\"\n #include \"log-tree.h\"\n-#include \"revision.h\"\n #include \"decorate.h\"\n #include \"string-list.h\"\n #include \"utf8.h\"\ndiff --git a/builtin-log.c b/builtin-log.c\nindex 5105c91..db7c344 100644\n--- a/builtin-log.c\n+++ b/builtin-log.c\n@@ -7,7 +7,6 @@\n #include \"builtin.h\"\n #include \"color.h\"\n #include \"diff.h\"\n-#include \"revision.h\"\n #include \"log-tree.h\"\n #include \"tag.h\"\n #include \"reflog-walk.h\"\ndiff --git a/builtin-merge.c b/builtin-merge.c\nindex cb4c645..fb6e61a 100644\n--- a/builtin-merge.c\n+++ b/builtin-merge.c\n@@ -12,12 +12,11 @@\n #include \"diff.h\"\n #include \"refs.h\"\n #include \"diffcore.h\"\n-#include \"revision.h\"\n+#include \"log-tree.h\"\n #include \"unpack-trees.h\"\n #include \"cache-tree.h\"\n #include \"dir.h\"\n #include \"utf8.h\"\n-#include \"log-tree.h\"\n #include \"color.h\"\n #include \"rerere.h\"\n #include \"help.h\"\ndiff --git a/builtin-rev-list.c b/builtin-rev-list.c\nindex cedfe9a..faac425 100644\n--- a/builtin-rev-list.c\n+++ b/builtin-rev-list.c\n@@ -4,9 +4,8 @@\n #include \"tag.h\"\n #include \"tree.h\"\n #include \"diff.h\"\n-#include \"revision.h\"\n-#include \"list-objects.h\"\n #include \"log-tree.h\"\n+#include \"list-objects.h\"\n #include \"graph.h\"\n \n /* bits #0-15 in revision.h */\ndiff --git a/diff-no-index.c b/diff-no-index.c\nindex cb68b8d..fa8b669 100644\n--- a/diff-no-index.c\n+++ b/diff-no-index.c\n@@ -10,7 +10,6 @@\n #include \"tag.h\"\n #include \"diff.h\"\n #include \"diffcore.h\"\n-#include \"revision.h\"\n #include \"log-tree.h\"\n #include \"string-list.h\"\n \ndiff --git a/pretty.c b/pretty.c\nindex efa7024..0465de1 100644\n--- a/pretty.c\n+++ b/pretty.c\n@@ -2,10 +2,9 @@\n #include \"commit.h\"\n #include \"utf8.h\"\n #include \"diff.h\"\n-#include \"revision.h\"\n+#include \"log-tree.h\"\n #include \"string-list.h\"\n #include \"mailmap.h\"\n-#include \"log-tree.h\"\n #include \"color.h\"\n \n static char *user_format;\ndiff --git a/revision.c b/revision.c\nindex 827108d..18425d6 100644\n--- a/revision.c\n+++ b/revision.c\n@@ -4,12 +4,11 @@\n #include \"commit.h\"\n #include \"diff.h\"\n #include \"refs.h\"\n-#include \"revision.h\"\n+#include \"log-tree.h\"\n #include \"graph.h\"\n #include \"grep.h\"\n #include \"reflog-walk.h\"\n #include \"patch-ids.h\"\n-#include \"log-tree.h\"\n \n volatile show_early_output_fn_t show_early_output;\n \n-- \n1.6.1.3\n"},{"id":"109992","messageId":"1238492721-92484-4-git-send-email-nathaniel.dawson@gmail.com","threadId":"18656","inReplyTo":"1238492721-92484-3-git-send-email-nathaniel.dawson@gmail.com","subject":"[PATCH 3/4] Header Includes Cleanup Part 2","fromName":"Nathaniel P Dawson","fromEmail":"nathaniel.dawson@gmail.com","sentAt":"2009-03-31T09:45:20Z","receivedAt":"2009-03-31T09:45:20Z","isPatch":true,"sender":{"key":"nathaniel.dawson@gmail.com","avatar":null},"body":"Deleted includes of string-list.h where merge-recursive.h was included\nsince it includes string-list.h.\n\nSigned-off-by: Nathaniel P Dawson <nathaniel.dawson@gmail.com>\n---\n merge-recursive.c |    3 +--\n 1 files changed, 1 insertions(+), 2 deletions(-)\n\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex 370151e..40d636f 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -10,11 +10,10 @@\n #include \"diffcore.h\"\n #include \"tag.h\"\n #include \"unpack-trees.h\"\n-#include \"string-list.h\"\n+#include \"merge-recursive.h\"\n #include \"xdiff-interface.h\"\n #include \"ll-merge.h\"\n #include \"attr.h\"\n-#include \"merge-recursive.h\"\n #include \"dir.h\"\n \n static struct tree *shift_tree_object(struct tree *one, struct tree *two)\n-- \n1.6.1.3\n"},{"id":"109993","messageId":"1238492721-92484-5-git-send-email-nathaniel.dawson@gmail.com","threadId":"18656","inReplyTo":"1238492721-92484-4-git-send-email-nathaniel.dawson@gmail.com","subject":"[PATCH 4/4] Header Includes Cleanup Part 2","fromName":"Nathaniel P Dawson","fromEmail":"nathaniel.dawson@gmail.com","sentAt":"2009-03-31T09:45:21Z","receivedAt":"2009-03-31T09:45:21Z","isPatch":true,"sender":{"key":"nathaniel.dawson@gmail.com","avatar":null},"body":"Deleted includes of cache.h where reflog-walk.h was included since\nreflog-walk.h includes it.\n\nSigned-off-by: Nathaniel P Dawson <nathaniel.dawson@gmail.com>\n---\n log-tree.c    |    3 +--\n reflog-walk.c |    3 +--\n revision.c    |    3 +--\n 3 files changed, 3 insertions(+), 6 deletions(-)\n\ndiff --git a/log-tree.c b/log-tree.c\nindex 9565c18..0433e61 100644\n--- a/log-tree.c\n+++ b/log-tree.c\n@@ -1,10 +1,9 @@\n-#include \"cache.h\"\n+#include \"reflog-walk.h\"\n #include \"diff.h\"\n #include \"commit.h\"\n #include \"tag.h\"\n #include \"graph.h\"\n #include \"log-tree.h\"\n-#include \"reflog-walk.h\"\n #include \"refs.h\"\n #include \"string-list.h\"\n \ndiff --git a/reflog-walk.c b/reflog-walk.c\nindex fd065f4..9198500 100644\n--- a/reflog-walk.c\n+++ b/reflog-walk.c\n@@ -1,10 +1,9 @@\n-#include \"cache.h\"\n+#include \"reflog-walk.h\"\n #include \"commit.h\"\n #include \"refs.h\"\n #include \"diff.h\"\n #include \"revision.h\"\n #include \"string-list.h\"\n-#include \"reflog-walk.h\"\n \n struct complete_reflogs {\n \tchar *ref;\ndiff --git a/revision.c b/revision.c\nindex 18425d6..b9d2aed 100644\n--- a/revision.c\n+++ b/revision.c\n@@ -1,4 +1,4 @@\n-#include \"cache.h\"\n+#include \"reflog-walk.h\"\n #include \"tag.h\"\n #include \"blob.h\"\n #include \"commit.h\"\n@@ -7,7 +7,6 @@\n #include \"log-tree.h\"\n #include \"graph.h\"\n #include \"grep.h\"\n-#include \"reflog-walk.h\"\n #include \"patch-ids.h\"\n \n volatile show_early_output_fn_t show_early_output;\n-- \n1.6.1.3\n"}]}