Skip to content

Commit d674bf5

Browse files
committed
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
2 parents 4eb6678 + aa3e9e6 commit d674bf5

File tree

6 files changed

+0
-6
lines changed

6 files changed

+0
-6
lines changed

attr.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include "utf8.h"
1515
#include "quote.h"
1616
#include "thread-utils.h"
17-
#include "dir.h"
1817

1918
const char git_attr__true[] = "(builtin)true";
2019
const char git_attr__false[] = "\0(builtin)false";

attr.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ struct git_attr;
121121
/* opaque structures used internally for attribute collection */
122122
struct all_attrs_item;
123123
struct attr_stack;
124-
struct index_state;
125124

126125
/*
127126
* Given a string, return the gitattribute object that

builtin/gc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "promisor-remote.h"
3131
#include "refs.h"
3232
#include "remote.h"
33-
#include "object-store.h"
3433
#include "exec-cmd.h"
3534
#include "hook.h"
3635

builtin/sparse-checkout.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include "run-command.h"
99
#include "strbuf.h"
1010
#include "string-list.h"
11-
#include "cache.h"
1211
#include "cache-tree.h"
1312
#include "lockfile.h"
1413
#include "resolve-undo.h"

builtin/stash.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "log-tree.h"
1717
#include "diffcore.h"
1818
#include "exec-cmd.h"
19-
#include "entry.h"
2019
#include "reflog.h"
2120

2221
#define INCLUDE_ALL_FILES 2

t/helper/test-run-command.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "thread-utils.h"
2020
#include "wildmatch.h"
2121
#include "gettext.h"
22-
#include "parse-options.h"
2322

2423
static int number_callbacks;
2524
static int parallel_next(struct child_process *cp,

0 commit comments

Comments
 (0)