Skip to content

Commit ec2f026

Browse files
newrengitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d48be35 commit ec2f026

12 files changed

+13
-10
lines changed

bulk-checkin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (c) 2011, Google Inc.
33
*/
4-
#include "git-compat-util.h"
4+
#include "cache.h"
55
#include "alloc.h"
66
#include "bulk-checkin.h"
77
#include "environment.h"

chunk-format.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include "chunk-format.h"
44
#include "csum-file.h"
55
#include "gettext.h"
6+
#include "trace2.h"
67

78
/*
89
* When writing a chunk-based file format, collect the chunks in

commit-graph.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "git-compat-util.h"
1+
#include "cache.h"
22
#include "config.h"
33
#include "gettext.h"
44
#include "hex.h"

csum-file.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#ifndef CSUM_FILE_H
22
#define CSUM_FILE_H
33

4-
#include "cache.h"
54
#include "hash.h"
65
#include "write-or-die.h"
76

delta-islands.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "git-compat-util.h"
1+
#include "cache.h"
22
#include "alloc.h"
33
#include "attr.h"
44
#include "object.h"

fetch-pack.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "git-compat-util.h"
1+
#include "cache.h"
22
#include "alloc.h"
33
#include "repository.h"
44
#include "config.h"

midx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "git-compat-util.h"
1+
#include "cache.h"
22
#include "abspath.h"
33
#include "alloc.h"
44
#include "config.h"

object-file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* This handles basic git object files - packing, unpacking,
77
* creation etc.
88
*/
9-
#include "git-compat-util.h"
9+
#include "cache.h"
1010
#include "abspath.h"
1111
#include "alloc.h"
1212
#include "config.h"

pack-bitmap-write.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "git-compat-util.h"
1+
#include "cache.h"
22
#include "alloc.h"
33
#include "environment.h"
44
#include "gettext.h"
@@ -17,6 +17,7 @@
1717
#include "pack-objects.h"
1818
#include "commit-reach.h"
1919
#include "prio-queue.h"
20+
#include "trace2.h"
2021

2122
struct bitmapped_commit {
2223
struct commit *commit;

pack-bitmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "git-compat-util.h"
1+
#include "cache.h"
22
#include "alloc.h"
33
#include "commit.h"
44
#include "gettext.h"

0 commit comments

Comments
 (0)