diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-02 15:30:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-02 15:30:40 -0700 |
| commit | b006f01ab5b6aa912f2c577c4af441564c6c78a4 (patch) | |
| tree | 747b0912ca315263a84f61fb1868a1f932ccec4d /commit-graph.h | |
| parent | bd1a32d5c8ec5987824acb63694361d082ce9092 (diff) | |
| parent | b18ef13a3fc5ed6e77980f67a7f3ca89050c1715 (diff) | |
| download | git-b006f01ab5b6aa912f2c577c4af441564c6c78a4.tar.xz | |
Merge branch 'ds/commit-graph-fsck'
"git fsck" learns to make sure the optional commit-graph file is in
a sane state.
* ds/commit-graph-fsck: (23 commits)
coccinelle: update commit.cocci
commit-graph: update design document
gc: automatically write commit-graph files
commit-graph: add '--reachable' option
commit-graph: use string-list API for input
fsck: verify commit-graph
commit-graph: verify contents match checksum
commit-graph: test for corrupted octopus edge
commit-graph: verify commit date
commit-graph: verify generation number
commit-graph: verify parent list
commit-graph: verify root tree OIDs
commit-graph: verify objects exist
commit-graph: verify corrupt OID fanout and lookup
commit-graph: verify required chunks are present
commit-graph: verify catches corrupt signature
commit-graph: add 'verify' subcommand
commit-graph: load a root tree from specific graph
commit: force commit to parse from object database
commit-graph: parse commit from chosen graph
...
Diffstat (limited to 'commit-graph.h')
| -rw-r--r-- | commit-graph.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/commit-graph.h b/commit-graph.h index 96cccb10f3..506cb45fb1 100644 --- a/commit-graph.h +++ b/commit-graph.h @@ -2,6 +2,8 @@ #define COMMIT_GRAPH_H #include "git-compat-util.h" +#include "repository.h" +#include "string-list.h" char *get_commit_graph_filename(const char *obj_dir); @@ -46,11 +48,12 @@ struct commit_graph { struct commit_graph *load_commit_graph_one(const char *graph_file); +void write_commit_graph_reachable(const char *obj_dir, int append); void write_commit_graph(const char *obj_dir, - const char **pack_indexes, - int nr_packs, - const char **commit_hex, - int nr_commits, + struct string_list *pack_indexes, + struct string_list *commit_hex, int append); +int verify_commit_graph(struct repository *r, struct commit_graph *g); + #endif |
