Browse Source

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
maint
Junio C Hamano 3 years ago
parent
commit
d674bf5570
  1. 1
      attr.c
  2. 1
      attr.h
  3. 1
      builtin/gc.c
  4. 1
      builtin/sparse-checkout.c
  5. 1
      builtin/stash.c
  6. 1
      t/helper/test-run-command.c

1
attr.c

@ -14,7 +14,6 @@ @@ -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";

1
attr.h

@ -121,7 +121,6 @@ struct git_attr; @@ -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

1
builtin/gc.c

@ -30,7 +30,6 @@ @@ -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"


1
builtin/sparse-checkout.c

@ -8,7 +8,6 @@ @@ -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"

1
builtin/stash.c

@ -16,7 +16,6 @@ @@ -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

1
t/helper/test-run-command.c

@ -19,7 +19,6 @@ @@ -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,

Loading…
Cancel
Save