aboutsummaryrefslogtreecommitdiffstats
path: root/commit-graph.h
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2024-06-14 08:50:32 +0200
committerJunio C Hamano <gitster@pobox.com>2024-06-14 10:26:33 -0700
commit8a676bdc5c3a9377322834326605b3804c7c54bf (patch)
tree551c16fa99f69bb3d1933876cc95b842cb64d8af /commit-graph.h
parent36026a0f30692e341f934f58cd1f780432e9d58b (diff)
downloadgit-8a676bdc5c3a9377322834326605b3804c7c54bf.tar.gz
hash-ll: merge with "hash.h"
The "hash-ll.h" header was introduced via d1cbe1e6d8 (hash-ll.h: split out of hash.h to remove dependency on repository.h, 2023-04-22) to make explicit the split between hash-related functions that rely on the global `the_repository`, and those that don't. This split is no longer necessary now that we we have removed the reliance on `the_repository`. Merge "hash-ll.h" back into "hash.h". This causes some code units to not include "repository.h" anymore, which requires us to add some forward declarations. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit-graph.h')
-rw-r--r--commit-graph.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/commit-graph.h b/commit-graph.h
index e519cb81cb..6781940195 100644
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -122,6 +122,8 @@ struct commit_graph *load_commit_graph_chain_fd_st(struct repository *r,
struct commit_graph *read_commit_graph_one(struct repository *r,
struct object_directory *odb);
+struct repo_settings;
+
/*
* Callers should initialize the repo_settings with prepare_repo_settings()
* prior to calling parse_commit_graph().