Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-03-24 00:09:30 +0300
committerJunio C Hamano <gitster@pobox.com>2022-03-24 00:09:30 +0300
commitd674bf5570b2eed9779a0b8879ae70219f27a2f9 (patch)
tree61580a527def4a5329f5a2a8a7987e3501bb2de8
parent4eb66787b04bf0ade6fed3303ce8cbd28977863c (diff)
parentaa3e9e61c12a41954aa2cad3f25b0b36dafb903f (diff)
Merge branch 'ep/remove-duplicated-includes'
Code clean-up. * ep/remove-duplicated-includes: attr.h: remove duplicate struct definition t/helper/test-run-command.c: delete duplicate include builtin/stash.c: delete duplicate include builtin/sparse-checkout.c: delete duplicate include builtin/gc.c: delete duplicate include attr.c: delete duplicate include
-rw-r--r--attr.c1
-rw-r--r--attr.h1
-rw-r--r--builtin/gc.c1
-rw-r--r--builtin/sparse-checkout.c1
-rw-r--r--builtin/stash.c1
-rw-r--r--t/helper/test-run-command.c1
6 files changed, 0 insertions, 6 deletions
diff --git a/attr.c b/attr.c
index 79adaa50ea..1626cade8b 100644
--- a/attr.c
+++ b/attr.c
@@ -14,7 +14,6 @@
#include "utf8.h"
#include "quote.h"
#include "thread-utils.h"
-#include "dir.h"
const char git_attr__true[] = "(builtin)true";
const char git_attr__false[] = "\0(builtin)false";
diff --git a/attr.h b/attr.h
index 3732505eda..3fb40cced0 100644
--- a/attr.h
+++ b/attr.h
@@ -121,7 +121,6 @@ struct git_attr;
/* opaque structures used internally for attribute collection */
struct all_attrs_item;
struct attr_stack;
-struct index_state;
/*
* Given a string, return the gitattribute object that
diff --git a/builtin/gc.c b/builtin/gc.c
index ffaf0daf5d..b335cffa33 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -30,7 +30,6 @@
#include "promisor-remote.h"
#include "refs.h"
#include "remote.h"
-#include "object-store.h"
#include "exec-cmd.h"
#include "hook.h"
diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c
index 7f02e4352a..0217d44c5b 100644
--- a/builtin/sparse-checkout.c
+++ b/builtin/sparse-checkout.c
@@ -8,7 +8,6 @@
#include "run-command.h"
#include "strbuf.h"
#include "string-list.h"
-#include "cache.h"
#include "cache-tree.h"
#include "lockfile.h"
#include "resolve-undo.h"
diff --git a/builtin/stash.c b/builtin/stash.c
index 242e73cbb0..ccdfdab44b 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -16,7 +16,6 @@
#include "log-tree.h"
#include "diffcore.h"
#include "exec-cmd.h"
-#include "entry.h"
#include "reflog.h"
#define INCLUDE_ALL_FILES 2
diff --git a/t/helper/test-run-command.c b/t/helper/test-run-command.c
index 3da8525ce6..f3b90aa834 100644
--- a/t/helper/test-run-command.c
+++ b/t/helper/test-run-command.c
@@ -19,7 +19,6 @@
#include "thread-utils.h"
#include "wildmatch.h"
#include "gettext.h"
-#include "parse-options.h"
static int number_callbacks;
static int parallel_next(struct child_process *cp,