diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-10-11 14:24:48 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-11 14:24:48 +0900 |
| commit | a4c5d9f66eaab94c874cd59584c0ede44b6e80bc (patch) | |
| tree | 651e0f1eb45290d25d364b0e1d75f4c41a291e58 | |
| parent | Merge branch 'js/range-diff-noprefix' (diff) | |
| parent | treewide: remove duplicate #include directives (diff) | |
| download | tgif-a4c5d9f66eaab94c874cd59584c0ede44b6e80bc.tar.xz | |
Merge branch 'rs/dedup-includes'
Code cleanup.
* rs/dedup-includes:
treewide: remove duplicate #include directives
| -rw-r--r-- | builtin/am.c | 1 | ||||
| -rw-r--r-- | builtin/blame.c | 1 | ||||
| -rw-r--r-- | builtin/clone.c | 1 | ||||
| -rw-r--r-- | builtin/describe.c | 1 | ||||
| -rw-r--r-- | builtin/rev-list.c | 1 | ||||
| -rw-r--r-- | builtin/worktree.c | 1 | ||||
| -rw-r--r-- | object.c | 1 | ||||
| -rw-r--r-- | packfile.c | 1 | ||||
| -rw-r--r-- | shallow.c | 3 | ||||
| -rw-r--r-- | unpack-trees.c | 1 |
10 files changed, 0 insertions, 12 deletions
diff --git a/builtin/am.c b/builtin/am.c index 39a70fc79a..761cac39e0 100644 --- 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 5a0c0c2312..e946ba6cd9 100644 --- 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 096be383cd..c46ee29f0a 100644 --- 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 e048f85484..90feab1120 100644 --- 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 74dbfad73d..e28d62ec64 100644 --- 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 fe70656327..4de44f579a 100644 --- 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" @@ -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 dd4b0e51c4..b4c218d78e 100644 --- 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" @@ -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 f0f56d40ac..33ea7810d8 100644 --- 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" |