From 5775da0ced9f316c84363ca8098040faeb3fdf71 Mon Sep 17 00:00:00 2001 From: Elia Pinto Date: Sun, 13 Mar 2022 19:55:32 +0000 Subject: [PATCH 1/6] attr.c: delete duplicate include dir.h is included more than once Signed-off-by: Elia Pinto Signed-off-by: Junio C Hamano --- attr.c | 1 - 1 file changed, 1 deletion(-) 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"; From 7cbbb77173986566c32199488c9f374c833f6ca9 Mon Sep 17 00:00:00 2001 From: Elia Pinto Date: Sun, 13 Mar 2022 19:55:33 +0000 Subject: [PATCH 2/6] builtin/gc.c: delete duplicate include object-store.h is included more than once. Signed-off-by: Elia Pinto Signed-off-by: Junio C Hamano --- builtin/gc.c | 1 - 1 file changed, 1 deletion(-) 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" From 07b04ebe86ce91e8965eb655e1136309c4ad44de Mon Sep 17 00:00:00 2001 From: Elia Pinto Date: Sun, 13 Mar 2022 19:55:34 +0000 Subject: [PATCH 3/6] builtin/sparse-checkout.c: delete duplicate include cache.h is included more than once. Signed-off-by: Elia Pinto Signed-off-by: Junio C Hamano --- builtin/sparse-checkout.c | 1 - 1 file changed, 1 deletion(-) diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c index 5518ed47f6..d88d141076 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" From 4fcea603c74eb2c78b4d8cd24349bf58af77df9d Mon Sep 17 00:00:00 2001 From: Elia Pinto Date: Sun, 13 Mar 2022 19:55:35 +0000 Subject: [PATCH 4/6] builtin/stash.c: delete duplicate include entry.h is included more than once. Signed-off-by: Elia Pinto Signed-off-by: Junio C Hamano --- builtin/stash.c | 1 - 1 file changed, 1 deletion(-) diff --git a/builtin/stash.c b/builtin/stash.c index 3e8af210fd..548048f444 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" #define INCLUDE_ALL_FILES 2 From 12e3b084de4fd5dd7ca879f3281402d200ddd6d1 Mon Sep 17 00:00:00 2001 From: Elia Pinto Date: Sun, 13 Mar 2022 19:55:36 +0000 Subject: [PATCH 5/6] t/helper/test-run-command.c: delete duplicate include parse-options.h is included more than once. Signed-off-by: Elia Pinto Signed-off-by: Junio C Hamano --- t/helper/test-run-command.c | 1 - 1 file changed, 1 deletion(-) diff --git a/t/helper/test-run-command.c b/t/helper/test-run-command.c index 8f370cd89f..1b35a143c1 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, From aa3e9e61c12a41954aa2cad3f25b0b36dafb903f Mon Sep 17 00:00:00 2001 From: Elia Pinto Date: Mon, 14 Mar 2022 00:23:27 +0000 Subject: [PATCH 6/6] attr.h: remove duplicate struct definition struct index_state is declared more than once. Signed-off-by: Elia Pinto Signed-off-by: Junio C Hamano --- attr.h | 1 - 1 file changed, 1 deletion(-) 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