csum-file.h: remove unnecessary inclusion of cache.h
With the change in the last commit to move several functions to write-or-die.h, csum-file.h no longer needs to include cache.h. However, removing that include forces several other C files, which directly or indirectly dependend upon csum-file.h's inclusion of cache.h, to now be more explicit about their dependencies. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
d48be35ca6
commit
ec2f026961
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2011, Google Inc.
|
* Copyright (c) 2011, Google Inc.
|
||||||
*/
|
*/
|
||||||
#include "git-compat-util.h"
|
#include "cache.h"
|
||||||
#include "alloc.h"
|
#include "alloc.h"
|
||||||
#include "bulk-checkin.h"
|
#include "bulk-checkin.h"
|
||||||
#include "environment.h"
|
#include "environment.h"
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
#include "chunk-format.h"
|
#include "chunk-format.h"
|
||||||
#include "csum-file.h"
|
#include "csum-file.h"
|
||||||
#include "gettext.h"
|
#include "gettext.h"
|
||||||
|
#include "trace2.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* When writing a chunk-based file format, collect the chunks in
|
* When writing a chunk-based file format, collect the chunks in
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include "git-compat-util.h"
|
#include "cache.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "gettext.h"
|
#include "gettext.h"
|
||||||
#include "hex.h"
|
#include "hex.h"
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
#ifndef CSUM_FILE_H
|
#ifndef CSUM_FILE_H
|
||||||
#define CSUM_FILE_H
|
#define CSUM_FILE_H
|
||||||
|
|
||||||
#include "cache.h"
|
|
||||||
#include "hash.h"
|
#include "hash.h"
|
||||||
#include "write-or-die.h"
|
#include "write-or-die.h"
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include "git-compat-util.h"
|
#include "cache.h"
|
||||||
#include "alloc.h"
|
#include "alloc.h"
|
||||||
#include "attr.h"
|
#include "attr.h"
|
||||||
#include "object.h"
|
#include "object.h"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include "git-compat-util.h"
|
#include "cache.h"
|
||||||
#include "alloc.h"
|
#include "alloc.h"
|
||||||
#include "repository.h"
|
#include "repository.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
2
midx.c
2
midx.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"
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
* This handles basic git object files - packing, unpacking,
|
* This handles basic git object files - packing, unpacking,
|
||||||
* creation etc.
|
* creation etc.
|
||||||
*/
|
*/
|
||||||
#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,4 +1,4 @@
|
|||||||
#include "git-compat-util.h"
|
#include "cache.h"
|
||||||
#include "alloc.h"
|
#include "alloc.h"
|
||||||
#include "environment.h"
|
#include "environment.h"
|
||||||
#include "gettext.h"
|
#include "gettext.h"
|
||||||
@ -17,6 +17,7 @@
|
|||||||
#include "pack-objects.h"
|
#include "pack-objects.h"
|
||||||
#include "commit-reach.h"
|
#include "commit-reach.h"
|
||||||
#include "prio-queue.h"
|
#include "prio-queue.h"
|
||||||
|
#include "trace2.h"
|
||||||
|
|
||||||
struct bitmapped_commit {
|
struct bitmapped_commit {
|
||||||
struct commit *commit;
|
struct commit *commit;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include "git-compat-util.h"
|
#include "cache.h"
|
||||||
#include "alloc.h"
|
#include "alloc.h"
|
||||||
#include "commit.h"
|
#include "commit.h"
|
||||||
#include "gettext.h"
|
#include "gettext.h"
|
||||||
|
2
pack.h
2
pack.h
@ -4,6 +4,8 @@
|
|||||||
#include "object.h"
|
#include "object.h"
|
||||||
#include "csum-file.h"
|
#include "csum-file.h"
|
||||||
|
|
||||||
|
struct packed_git;
|
||||||
|
struct pack_window;
|
||||||
struct repository;
|
struct repository;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include "git-compat-util.h"
|
#include "cache.h"
|
||||||
#include "alloc.h"
|
#include "alloc.h"
|
||||||
#include "environment.h"
|
#include "environment.h"
|
||||||
#include "gettext.h"
|
#include "gettext.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user