Skip to content

Commit

Permalink
csum-file.h: remove unnecessary inclusion of cache.h
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
newren committed Mar 21, 2023
1 parent 6e40d1d commit 72d58b3
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion bulk-checkin.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2011, Google Inc.
*/
#include "git-compat-util.h"
#include "cache.h"
#include "alloc.h"
#include "bulk-checkin.h"
#include "environment.h"
Expand Down
1 change: 1 addition & 0 deletions chunk-format.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "chunk-format.h"
#include "csum-file.h"
#include "gettext.h"
#include "trace2.h"

/*
* When writing a chunk-based file format, collect the chunks in
Expand Down
2 changes: 1 addition & 1 deletion commit-graph.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "git-compat-util.h"
#include "cache.h"
#include "config.h"
#include "gettext.h"
#include "hex.h"
Expand Down
1 change: 0 additions & 1 deletion csum-file.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#ifndef CSUM_FILE_H
#define CSUM_FILE_H

#include "cache.h"
#include "hash.h"
#include "write-or-die.h"

Expand Down
2 changes: 1 addition & 1 deletion delta-islands.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "git-compat-util.h"
#include "cache.h"
#include "alloc.h"
#include "attr.h"
#include "object.h"
Expand Down
2 changes: 1 addition & 1 deletion fetch-pack.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "git-compat-util.h"
#include "cache.h"
#include "alloc.h"
#include "repository.h"
#include "config.h"
Expand Down
2 changes: 1 addition & 1 deletion midx.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "git-compat-util.h"
#include "cache.h"
#include "abspath.h"
#include "alloc.h"
#include "config.h"
Expand Down
2 changes: 1 addition & 1 deletion object-file.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This handles basic git object files - packing, unpacking,
* creation etc.
*/
#include "git-compat-util.h"
#include "cache.h"
#include "abspath.h"
#include "alloc.h"
#include "config.h"
Expand Down
3 changes: 2 additions & 1 deletion pack-bitmap-write.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "git-compat-util.h"
#include "cache.h"
#include "alloc.h"
#include "environment.h"
#include "gettext.h"
Expand All @@ -17,6 +17,7 @@
#include "pack-objects.h"
#include "commit-reach.h"
#include "prio-queue.h"
#include "trace2.h"

struct bitmapped_commit {
struct commit *commit;
Expand Down
2 changes: 1 addition & 1 deletion pack-bitmap.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "git-compat-util.h"
#include "cache.h"
#include "alloc.h"
#include "commit.h"
#include "gettext.h"
Expand Down
2 changes: 2 additions & 0 deletions pack.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include "object.h"
#include "csum-file.h"

struct packed_git;
struct pack_window;
struct repository;

/*
Expand Down
2 changes: 1 addition & 1 deletion packfile.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "git-compat-util.h"
#include "cache.h"
#include "alloc.h"
#include "environment.h"
#include "gettext.h"
Expand Down

0 comments on commit 72d58b3

Please sign in to comment.