Browse Source

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>
main
Elijah Newren 2 years ago committed by Junio C Hamano
parent
commit
ec2f026961
  1. 2
      bulk-checkin.c
  2. 1
      chunk-format.c
  3. 2
      commit-graph.c
  4. 1
      csum-file.h
  5. 2
      delta-islands.c
  6. 2
      fetch-pack.c
  7. 2
      midx.c
  8. 2
      object-file.c
  9. 3
      pack-bitmap-write.c
  10. 2
      pack-bitmap.c
  11. 2
      pack.h
  12. 2
      packfile.c

2
bulk-checkin.c

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

1
chunk-format.c

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

2
commit-graph.c

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
#include "git-compat-util.h"
#include "cache.h"
#include "config.h"
#include "gettext.h"
#include "hex.h"

1
csum-file.h

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
#ifndef CSUM_FILE_H
#define CSUM_FILE_H

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


2
delta-islands.c

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
#include "git-compat-util.h"
#include "cache.h"
#include "alloc.h"
#include "attr.h"
#include "object.h"

2
fetch-pack.c

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
#include "git-compat-util.h"
#include "cache.h"
#include "alloc.h"
#include "repository.h"
#include "config.h"

2
midx.c

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
#include "git-compat-util.h"
#include "cache.h"
#include "abspath.h"
#include "alloc.h"
#include "config.h"

2
object-file.c

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

3
pack-bitmap-write.c

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
#include "git-compat-util.h"
#include "cache.h"
#include "alloc.h"
#include "environment.h"
#include "gettext.h"
@ -17,6 +17,7 @@ @@ -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;

2
pack-bitmap.c

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
#include "git-compat-util.h"
#include "cache.h"
#include "alloc.h"
#include "commit.h"
#include "gettext.h"

2
pack.h

@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
#include "object.h"
#include "csum-file.h"

struct packed_git;
struct pack_window;
struct repository;

/*

2
packfile.c

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
#include "git-compat-util.h"
#include "cache.h"
#include "alloc.h"
#include "environment.h"
#include "gettext.h"

Loading…
Cancel
Save