treewide: reduce includes of cache.h in other headers
We had a handful of headers including cache.h that didn't need to anymore. Drop those includes and replace them with includes of smaller files, or forward declarations. However, note that two .c files now need to directly include cache.h, though they should have been including it all along given they are directly using structs defined in it. Signed-off-by: Elijah Newren <newren@gmail.com> Acked-by: Calvin Wan <calvinwan@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
65156bb7ec
commit
b7b189cd5a
@ -1,9 +1,9 @@
|
|||||||
#ifndef ARCHIVE_H
|
#ifndef ARCHIVE_H
|
||||||
#define ARCHIVE_H
|
#define ARCHIVE_H
|
||||||
|
|
||||||
#include "cache.h"
|
|
||||||
#include "object-name.h"
|
#include "object-name.h"
|
||||||
#include "pathspec.h"
|
#include "pathspec.h"
|
||||||
|
#include "string-list.h"
|
||||||
|
|
||||||
struct repository;
|
struct repository;
|
||||||
struct pretty_print_context;
|
struct pretty_print_context;
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
#include "cache.h"
|
#include "git-compat-util.h"
|
||||||
#include "abspath.h"
|
#include "abspath.h"
|
||||||
#include "chdir-notify.h"
|
#include "chdir-notify.h"
|
||||||
#include "list.h"
|
#include "list.h"
|
||||||
|
#include "path.h"
|
||||||
#include "strbuf.h"
|
#include "strbuf.h"
|
||||||
#include "trace.h"
|
#include "trace.h"
|
||||||
|
|
||||||
|
3
quote.c
3
quote.c
@ -1,5 +1,6 @@
|
|||||||
#include "cache.h"
|
#include "git-compat-util.h"
|
||||||
#include "alloc.h"
|
#include "alloc.h"
|
||||||
|
#include "path.h"
|
||||||
#include "quote.h"
|
#include "quote.h"
|
||||||
#include "strbuf.h"
|
#include "strbuf.h"
|
||||||
#include "strvec.h"
|
#include "strvec.h"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#ifndef REFS_REF_CACHE_H
|
#ifndef REFS_REF_CACHE_H
|
||||||
#define REFS_REF_CACHE_H
|
#define REFS_REF_CACHE_H
|
||||||
|
|
||||||
#include "cache.h"
|
#include "hash.h"
|
||||||
|
|
||||||
struct ref_dir;
|
struct ref_dir;
|
||||||
struct ref_store;
|
struct ref_store;
|
||||||
|
2
rerere.c
2
rerere.c
@ -1,4 +1,4 @@
|
|||||||
#include "git-compat-util.h"
|
#include "cache.h"
|
||||||
#include "abspath.h"
|
#include "abspath.h"
|
||||||
#include "alloc.h"
|
#include "alloc.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
@ -1,7 +1,12 @@
|
|||||||
#ifndef RESOLVE_UNDO_H
|
#ifndef RESOLVE_UNDO_H
|
||||||
#define RESOLVE_UNDO_H
|
#define RESOLVE_UNDO_H
|
||||||
|
|
||||||
#include "cache.h"
|
struct cache_entry;
|
||||||
|
struct index_state;
|
||||||
|
struct pathspec;
|
||||||
|
struct string_list;
|
||||||
|
|
||||||
|
#include "hash.h"
|
||||||
|
|
||||||
struct resolve_undo_info {
|
struct resolve_undo_info {
|
||||||
unsigned int mode[3];
|
unsigned int mode[3];
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include "git-compat-util.h"
|
#include "cache.h"
|
||||||
#include "alloc.h"
|
#include "alloc.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "environment.h"
|
#include "environment.h"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#ifndef SPLIT_INDEX_H
|
#ifndef SPLIT_INDEX_H
|
||||||
#define SPLIT_INDEX_H
|
#define SPLIT_INDEX_H
|
||||||
|
|
||||||
#include "cache.h"
|
#include "hash.h"
|
||||||
|
|
||||||
struct index_state;
|
struct index_state;
|
||||||
struct strbuf;
|
struct strbuf;
|
||||||
|
Loading…
Reference in New Issue
Block a user