treewide: remove duplicate #include directives

Found with "git grep '^#include ' '*.c' | sort | uniq -d".

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/am.c b/builtin/am.c
index ee7305eaa663ae434b44ed567661b5fd81dbe817..b015e1d7d14c1c7f561ef8ffbe75c37225ab86f0 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -24,7 +24,6 @@
 #include "sequencer.h"
 #include "revision.h"
 #include "merge-recursive.h"
-#include "revision.h"
 #include "log-tree.h"
 #include "notes-utils.h"
 #include "rerere.h"

diff --git a/builtin/blame.c b/builtin/blame.c
index b6534d4dea9ad81a34eaf099f7cf9a0a1e56f410..a9ac20624ca3baf8300774dd676135f4de72448e 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -26,7 +26,6 @@
 #include "progress.h"
 #include "object-store.h"
 #include "blame.h"
-#include "string-list.h"
 #include "refs.h"
 
 static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>");

diff --git a/builtin/clone.c b/builtin/clone.c
index 2048b6760aa9f0a426524e5ea1bd7a3a4c4c5536..9d73102c42b38d29e7447f1c78b7bd289be868e1 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -32,7 +32,6 @@
 #include "connected.h"
 #include "packfile.h"
 #include "list-objects-filter-options.h"
-#include "object-store.h"
 
 /*
  * Overall FIXMEs:

diff --git a/builtin/describe.c b/builtin/describe.c
index e048f85484c5ea2bd1d6b684aa10b407b2699c45..90feab11205508df985c1eef52deb090779bbb4a 100644 (file)
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -15,7 +15,6 @@
 #include "argv-array.h"
 #include "run-command.h"
 #include "object-store.h"
-#include "revision.h"
 #include "list-objects.h"
 #include "commit-slab.h"
 

diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index b8dc2e1fba6ce4c7763a55924f34d86796d982a2..fb8187fba5b87e5242f966976e97975adfe2d642 100644 (file)
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -18,7 +18,6 @@
 #include "reflog-walk.h"
 #include "oidset.h"
 #include "packfile.h"
-#include "object-store.h"
 
 static const char rev_list_usage[] =
 "git rev-list [OPTION] <commit-id>... [ -- paths... ]\n"

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 7f094f8170ae7d55d453a2b0ab5db933ddf395ba..0a53788151844e46278d1cae39828854972b2ac6 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -10,7 +10,6 @@
 #include "run-command.h"
 #include "sigchain.h"
 #include "submodule.h"
-#include "refs.h"
 #include "utf8.h"
 #include "worktree.h"
 

diff --git a/object.c b/object.c
index 07bdd5b26e2b10a8f4f7851e6c3d545ede23c461..3b8b8c55c9a8e7e2961d9911f1ec4fd70730f07f 100644 (file)
--- a/object.c
+++ b/object.c
@@ -7,7 +7,6 @@
 #include "commit.h"
 #include "tag.h"
 #include "alloc.h"
-#include "object-store.h"
 #include "packfile.h"
 #include "commit-graph.h"
 

diff --git a/packfile.c b/packfile.c
index f3f962af4c6ccce48a5a0175ae95de9a171288c0..87512540f8ff9d9826a47c2e1ba6b19a813c1ed5 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -6,7 +6,6 @@
 #include "mergesort.h"
 #include "packfile.h"
 #include "delta.h"
-#include "list.h"
 #include "streaming.h"
 #include "sha1-lookup.h"
 #include "commit.h"

diff --git a/shallow.c b/shallow.c
index 5fa2b15d3705439b0088ac0fa0800c81ffad7a41..ae813658fb497ca6fadd9478a820b8d583e454da 100644 (file)
--- a/shallow.c
+++ b/shallow.c
@@ -12,10 +12,7 @@
 #include "diff.h"
 #include "revision.h"
 #include "commit-slab.h"
-#include "revision.h"
 #include "list-objects.h"
-#include "commit-slab.h"
-#include "repository.h"
 #include "commit-reach.h"
 
 void set_alternate_shallow_file(struct repository *r, const char *path, int override)

diff --git a/unpack-trees.c b/unpack-trees.c
index f0f56d40ac9944e5801955cb56e78d6024b78e52..33ea7810d8cfbb819fcfc76ca8e71aa03c66f3be 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -11,7 +11,6 @@
 #include "refs.h"
 #include "attr.h"
 #include "split-index.h"
-#include "dir.h"
 #include "submodule.h"
 #include "submodule-config.h"
 #include "fsmonitor.h"