diff.h: remove unnecessary include of oidset.h

This also made it clear that several .c files depended upon various
things that oidset included, but had omitted the direct #include for
those headers.  Add those now.

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

diff --git a/add-interactive.c b/add-interactive.c
index 40f88c0205103f67cb9549f6e7b02397358d69cf..add9a1ad4364f92833256d5f53dbb3bc85b43ede 100644 (file)
--- a/add-interactive.c
+++ b/add-interactive.c
@@ -4,9 +4,11 @@
 #include "config.h"
 #include "diffcore.h"
 #include "gettext.h"
+#include "hash.h"
 #include "hex.h"
 #include "preload-index.h"
 #include "read-cache-ll.h"
+#include "repository.h"
 #include "revision.h"
 #include "refs.h"
 #include "string-list.h"

diff --git a/add-patch.c b/add-patch.c
index 875b96e22740b5a802c686c946508ebee0b23077..53e324829593bd3444919b1666deefe354ca8bcb 100644 (file)
--- a/add-patch.c
+++ b/add-patch.c
@@ -7,6 +7,7 @@
 #include "gettext.h"
 #include "object-name.h"
 #include "read-cache-ll.h"
+#include "repository.h"
 #include "strbuf.h"
 #include "run-command.h"
 #include "strvec.h"

diff --git a/blame.h b/blame.h
index b60d1d81e3032acc5df2191321202b13eecc81fe..31ddc85f19e359908710162ad4aa144784dec16b 100644 (file)
--- a/blame.h
+++ b/blame.h
@@ -2,6 +2,7 @@
 #define BLAME_H
 
 #include "commit.h"
+#include "oidset.h"
 #include "xdiff-interface.h"
 #include "revision.h"
 #include "prio-queue.h"

diff --git a/builtin/add.c b/builtin/add.c
index 431831144878efa10e191ec68b4ab5c4fded0cd2..e3ca3e4edbe803ef27a15a66f8755f7d9202c1d2 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -21,6 +21,7 @@
 #include "diff.h"
 #include "diffcore.h"
 #include "read-cache.h"
+#include "repository.h"
 #include "revision.h"
 #include "bulk-checkin.h"
 #include "strvec.h"

diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index a4a2ab76c72732538ad16ad9888f89c2789c9ff1..50330b8dd2fd289a188b6143d528da2658327057 100644 (file)
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -9,6 +9,7 @@
 #include "diff-merges.h"
 #include "commit.h"
 #include "preload-index.h"
+#include "repository.h"
 #include "revision.h"
 #include "submodule.h"
 

diff --git a/builtin/diff-index.c b/builtin/diff-index.c
index 1ab8f8b6dc55f57b1e2a9f1257b729d8bc5d56af..a8b2c0a4b969b1a22bccfb63182d22dd5093ac84 100644 (file)
--- a/builtin/diff-index.c
+++ b/builtin/diff-index.c
@@ -4,6 +4,7 @@
 #include "diff-merges.h"
 #include "commit.h"
 #include "preload-index.h"
+#include "repository.h"
 #include "revision.h"
 #include "setup.h"
 #include "submodule.h"

diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c
index c2e519301e91cef4ac3204a37aa9e792c518c0f3..932924e5d0e573959e2d8c70168f77224de45bc8 100644 (file)
--- a/builtin/merge-ours.c
+++ b/builtin/merge-ours.c
@@ -10,6 +10,7 @@
 #include "git-compat-util.h"
 #include "builtin.h"
 #include "diff.h"
+#include "repository.h"
 
 static const char builtin_merge_ours_usage[] =
        "git merge-ours <base>... -- HEAD <remote>...";

diff --git a/builtin/patch-id.c b/builtin/patch-id.c
index 27952f1a6fd4663fe4b0184a7ba36ab4a5088542..b7118b290b1329a9b9e57c8477aa5e404c0883d3 100644 (file)
--- a/builtin/patch-id.c
+++ b/builtin/patch-id.c
@@ -2,6 +2,7 @@
 #include "config.h"
 #include "diff.h"
 #include "gettext.h"
+#include "hash.h"
 #include "hex.h"
 #include "parse-options.h"
 

diff --git a/builtin/range-diff.c b/builtin/range-diff.c
index 8610390d7c56c7e078633ded778713e251e1746a..e455a4795cc8101576a806ee68df71a56c7661ce 100644 (file)
--- a/builtin/range-diff.c
+++ b/builtin/range-diff.c
@@ -4,6 +4,7 @@
 #include "parse-options.h"
 #include "range-diff.h"
 #include "config.h"
+#include "repository.h"
 #include "revision.h"
 
 static const char * const builtin_range_diff_usage[] = {

diff --git a/builtin/reflog.c b/builtin/reflog.c
index a1fa0c855f4ae74188e5e258c8a7b0f9ba57ed19..fc21774880800b6647e922fc8ea3e9889ac1d17f 100644 (file)
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -1,6 +1,7 @@
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"
+#include "repository.h"
 #include "revision.h"
 #include "reachable.h"
 #include "worktree.h"

diff --git a/builtin/reset.c b/builtin/reset.c
index f947c449d14849285b4dd26d19ee30bbffd3d1d9..dad2117c97429097c2171a52436d4018d4920891 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -13,6 +13,7 @@
 #include "config.h"
 #include "environment.h"
 #include "gettext.h"
+#include "hash.h"
 #include "hex.h"
 #include "lockfile.h"
 #include "tag.h"

diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 6eb5965bee43b113b5f095bdef776020b3bc28a8..4a219ea93bb435e9e8974264ee8b2008393c7e4d 100644 (file)
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -11,6 +11,7 @@
 #include "commit.h"
 #include "environment.h"
 #include "gettext.h"
+#include "hash.h"
 #include "hex.h"
 #include "refs.h"
 #include "quote.h"

diff --git a/builtin/revert.c b/builtin/revert.c
index 0240ec8593b27dbb44e9d5720340c8362bcec025..f6f07d9b539331f7717ccec8d8a2f287e7ad3be5 100644 (file)
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -5,6 +5,7 @@
 #include "parse-options.h"
 #include "diff.h"
 #include "gettext.h"
+#include "repository.h"
 #include "revision.h"
 #include "rerere.h"
 #include "dir.h"

diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 99be9dc417d2a9152ccf82ab16c5102c11db71e9..1307ed2b88a77dbb93d38528b8d39e2b87452d07 100644 (file)
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -5,6 +5,7 @@
 #include "environment.h"
 #include "gettext.h"
 #include "string-list.h"
+#include "repository.h"
 #include "revision.h"
 #include "utf8.h"
 #include "mailmap.h"

diff --git a/builtin/stash.c b/builtin/stash.c
index d3d5bb95e26550e285c5f43ca4a916d881faf090..84e83e0627f4dc077746ba898c16a6bcd007fe69 100644 (file)
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -4,6 +4,7 @@
 #include "config.h"
 #include "environment.h"
 #include "gettext.h"
+#include "hash.h"
 #include "hex.h"
 #include "object-name.h"
 #include "parse-options.h"

diff --git a/diff-lib.c b/diff-lib.c
index f3aa7f93c783cca279eb188828daa7a300d6d0ff..cad18099abab19aac0a5728a4c63fa92b6741ab7 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -7,6 +7,7 @@
 #include "diff.h"
 #include "diffcore.h"
 #include "gettext.h"
+#include "hash.h"
 #include "hex.h"
 #include "object-name.h"
 #include "read-cache.h"
@@ -14,6 +15,7 @@
 #include "cache-tree.h"
 #include "unpack-trees.h"
 #include "refs.h"
+#include "repository.h"
 #include "submodule.h"
 #include "symlinks.h"
 #include "trace.h"

diff --git a/diff.h b/diff.h
index 5a0c91bb482efe3f77c1a8fc83674ec98c34ab2b..2102df329a5f09b119bc0e73fb55805d164a77b7 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -4,10 +4,12 @@
 #ifndef DIFF_H
 #define DIFF_H
 
+#include "hash-ll.h"
 #include "pathspec.h"
-#include "oidset.h"
 #include "strbuf.h"
 
+struct oidset;
+
 /**
  * The diff API is for programs that compare two sets of files (e.g. two trees,
  * one tree and the index) and present the found difference in various ways.

diff --git a/diffcore-break.c b/diffcore-break.c
index 4909dc088e6191a8390115f7696ed4ca239123b5..f57ece2757d46ea6dee3af34a476c5fdd9908b0d 100644 (file)
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -4,6 +4,7 @@
 #include "git-compat-util.h"
 #include "diff.h"
 #include "diffcore.h"
+#include "hash.h"
 #include "object.h"
 #include "promisor-remote.h"
 

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 13c98a7b5e7751c8db6a9d78575a9b76e0313f92..b195fa4eb3c045c030a47c84edcaa702e447c8f8 100644 (file)
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -7,6 +7,7 @@
 #include "diffcore.h"
 #include "xdiff-interface.h"
 #include "kwset.h"
+#include "oidset.h"
 #include "pretty.h"
 #include "quote.h"
 

diff --git a/line-log.c b/line-log.c
index 6a7ac312a43f4a7c6b24f213d2e1d583d0e8b64f..2eff914bf369ee0d794294d8632e42bf58606f1d 100644 (file)
--- a/line-log.c
+++ b/line-log.c
@@ -8,6 +8,7 @@
 #include "diff.h"
 #include "commit.h"
 #include "decorate.h"
+#include "repository.h"
 #include "revision.h"
 #include "xdiff-interface.h"
 #include "strbuf.h"

diff --git a/merge.c b/merge.c
index 83bcba6943eee91155c45d7d5c5bf412d7b7acc8..b60925459c292bbb4a9daae46534edfbb3eca756 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -2,10 +2,12 @@
 #include "diff.h"
 #include "diffcore.h"
 #include "gettext.h"
+#include "hash.h"
 #include "hex.h"
 #include "lockfile.h"
 #include "merge.h"
 #include "commit.h"
+#include "repository.h"
 #include "run-command.h"
 #include "resolve-undo.h"
 #include "tree.h"

diff --git a/patch-ids.c b/patch-ids.c
index 19af7bee9840e4fd945b21a10364bcd5c1fb546f..c3e1a0dd216c80c92c47f0e2a98d74a57c422742 100644 (file)
--- a/patch-ids.c
+++ b/patch-ids.c
@@ -1,6 +1,7 @@
 #include "git-compat-util.h"
 #include "diff.h"
 #include "commit.h"
+#include "hash.h"
 #include "hash-lookup.h"
 #include "hex.h"
 #include "patch-ids.h"

diff --git a/pretty.c b/pretty.c
index 0bb938021ba593df826b91d39a2ec7a059e84b61..2cf2cbbd0386e4a026d444f18badcecf00f154d8 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -4,6 +4,7 @@
 #include "commit.h"
 #include "environment.h"
 #include "gettext.h"
+#include "hash.h"
 #include "hex.h"
 #include "utf8.h"
 #include "diff.h"

diff --git a/range-diff.c b/range-diff.c
index 6a704e6f4719d85f5c3bc49c4999a4dac0bd65cc..2e86063491e11fcf9162da016be8471f603e07a2 100644 (file)
--- a/range-diff.c
+++ b/range-diff.c
@@ -13,6 +13,7 @@
 #include "commit.h"
 #include "pager.h"
 #include "pretty.h"
+#include "repository.h"
 #include "userdiff.h"
 #include "apply.h"
 #include "revision.h"

diff --git a/reflog-walk.c b/reflog-walk.c
index 4ba1a10c82cdd3920a1c2818de29a18e1ea153ca..d337e64431f702b084b8f0a41759d86a85945a72 100644 (file)
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -3,6 +3,7 @@
 #include "commit.h"
 #include "refs.h"
 #include "diff.h"
+#include "repository.h"
 #include "revision.h"
 #include "string-list.h"
 #include "reflog-walk.h"

diff --git a/t/helper/test-fast-rebase.c b/t/helper/test-fast-rebase.c
index 62c5b5d704b98ea781856a14c293c3dd810846e2..cac20a72b3fcb52c5ccb66cbbb1679ecb8f39f97 100644 (file)
--- a/t/helper/test-fast-rebase.c
+++ b/t/helper/test-fast-rebase.c
@@ -16,6 +16,7 @@
 #include "commit.h"
 #include "environment.h"
 #include "gettext.h"
+#include "hash.h"
 #include "hex.h"
 #include "lockfile.h"
 #include "merge-ort.h"

diff --git a/t/helper/test-revision-walking.c b/t/helper/test-revision-walking.c
index 0c62b9de1850b1409313395df3a76f8d591bf910..f346951bc28c99e4791d841fac0d873a128cc973 100644 (file)
--- a/t/helper/test-revision-walking.c
+++ b/t/helper/test-revision-walking.c
@@ -11,6 +11,7 @@
 #include "test-tool.h"
 #include "commit.h"
 #include "diff.h"
+#include "repository.h"
 #include "revision.h"
 #include "setup.h"
 

diff --git a/transport-helper.c b/transport-helper.c
index 6b816940dc64d8803c89c866bc2d0acdae849ad6..5c0bc6a896e2216fd9d14f7727f97693350a7d25 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -8,6 +8,7 @@
 #include "gettext.h"
 #include "hex.h"
 #include "object-name.h"
+#include "repository.h"
 #include "revision.h"
 #include "remote.h"
 #include "string-list.h"

diff --git a/tree-diff.c b/tree-diff.c
index 20bb15f38d9471b9de64fa6bafd620fd18b61901..966946848aedc10deed60225687cb110eb9935bc 100644 (file)
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -4,6 +4,7 @@
 #include "git-compat-util.h"
 #include "diff.h"
 #include "diffcore.h"
+#include "hash.h"
 #include "tree.h"
 #include "tree-walk.h"
 

diff --git a/wt-status.c b/wt-status.c
index 7ada6b305f668aff0640d71e00be3000b2c6d05b..bcd0ef8044172ab30ea09eef66a710256529f37c 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -7,6 +7,7 @@
 #include "diff.h"
 #include "environment.h"
 #include "gettext.h"
+#include "hash.h"
 #include "hex.h"
 #include "object-name.h"
 #include "path.h"