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
This commit is contained in:
Junio C Hamano 2022-03-23 14:09:30 -07:00
Родитель 4eb66787b0 aa3e9e61c1
Коммит d674bf5570
6 изменённых файлов: 0 добавлений и 6 удалений

1
attr.c
Просмотреть файл

@ -14,7 +14,6 @@
#include "utf8.h" #include "utf8.h"
#include "quote.h" #include "quote.h"
#include "thread-utils.h" #include "thread-utils.h"
#include "dir.h"
const char git_attr__true[] = "(builtin)true"; const char git_attr__true[] = "(builtin)true";
const char git_attr__false[] = "\0(builtin)false"; const char git_attr__false[] = "\0(builtin)false";

1
attr.h
Просмотреть файл

@ -121,7 +121,6 @@ struct git_attr;
/* opaque structures used internally for attribute collection */ /* opaque structures used internally for attribute collection */
struct all_attrs_item; struct all_attrs_item;
struct attr_stack; struct attr_stack;
struct index_state;
/* /*
* Given a string, return the gitattribute object that * Given a string, return the gitattribute object that

Просмотреть файл

@ -30,7 +30,6 @@
#include "promisor-remote.h" #include "promisor-remote.h"
#include "refs.h" #include "refs.h"
#include "remote.h" #include "remote.h"
#include "object-store.h"
#include "exec-cmd.h" #include "exec-cmd.h"
#include "hook.h" #include "hook.h"

Просмотреть файл

@ -8,7 +8,6 @@
#include "run-command.h" #include "run-command.h"
#include "strbuf.h" #include "strbuf.h"
#include "string-list.h" #include "string-list.h"
#include "cache.h"
#include "cache-tree.h" #include "cache-tree.h"
#include "lockfile.h" #include "lockfile.h"
#include "resolve-undo.h" #include "resolve-undo.h"

Просмотреть файл

@ -16,7 +16,6 @@
#include "log-tree.h" #include "log-tree.h"
#include "diffcore.h" #include "diffcore.h"
#include "exec-cmd.h" #include "exec-cmd.h"
#include "entry.h"
#include "reflog.h" #include "reflog.h"
#define INCLUDE_ALL_FILES 2 #define INCLUDE_ALL_FILES 2

Просмотреть файл

@ -19,7 +19,6 @@
#include "thread-utils.h" #include "thread-utils.h"
#include "wildmatch.h" #include "wildmatch.h"
#include "gettext.h" #include "gettext.h"
#include "parse-options.h"
static int number_callbacks; static int number_callbacks;
static int parallel_next(struct child_process *cp, static int parallel_next(struct child_process *cp,