Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2023-02-24 03:09:25 +0300
committerJunio C Hamano <gitster@pobox.com>2023-02-24 04:25:28 +0300
commit41227cb138c91fbd369ac6ee4877f253b39260cc (patch)
tree197f151f5fe36292f68ab92735ff355d3e544df5 /diffcore.h
parent36bf19589055fb71aac0ed6719dfe5b385adc2bf (diff)
hash.h: move some oid-related declarations from cache.h
These defines and enum are all oid-related and as such seem to make more sense being included in hash.h. Further, moving them there allows us to remove some includes of cache.h in other files. The change to line-log.h might look unrelated, but line-log.h includes diffcore.h, which previously included cache.h, which included the kitchen sink. Since this patch makes diffcore.h no longer include cache.h, the compiler complains about the 'struct string_list *' function parameter. Add a forward declaration for struct string_list to address this. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore.h')
-rw-r--r--diffcore.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/diffcore.h b/diffcore.h
index 9b588a1ee1..1701ed50b9 100644
--- a/diffcore.h
+++ b/diffcore.h
@@ -4,9 +4,11 @@
#ifndef DIFFCORE_H
#define DIFFCORE_H
-#include "cache.h"
+#include "hash.h"
struct diff_options;
+struct mem_pool;
+struct oid_array;
struct repository;
struct strintmap;
struct strmap;