diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-10-07 11:32:55 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-07 11:32:55 +0900 |
| commit | 098e8c6716b8c6abc29b6788acdb3ac8725f835d (patch) | |
| tree | 1380bdbd3b2c5623c20fb2c5a8064bbeeb0fe7be /commit-graph.h | |
| parent | Merge branch 'mr/complete-more-for-log-etc' (diff) | |
| parent | upload-pack: disable commit graph more gently for shallow traversal (diff) | |
| download | git-098e8c6716b8c6abc29b6788acdb3ac8725f835d.tar.gz git-098e8c6716b8c6abc29b6788acdb3ac8725f835d.zip | |
Merge branch 'jk/disable-commit-graph-during-upload-pack'
The "upload-pack" (the counterpart of "git fetch") needs to disable
commit-graph when responding to a shallow clone/fetch request, but
the way this was done made Git panic, which has been corrected.
* jk/disable-commit-graph-during-upload-pack:
upload-pack: disable commit graph more gently for shallow traversal
commit-graph: bump DIE_ON_LOAD check to actual load-time
Diffstat (limited to 'commit-graph.h')
| -rw-r--r-- | commit-graph.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/commit-graph.h b/commit-graph.h index 486e64e591..7f5c933fa2 100644 --- a/commit-graph.h +++ b/commit-graph.h @@ -107,4 +107,10 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags) void close_commit_graph(struct raw_object_store *); void free_commit_graph(struct commit_graph *); +/* + * Disable further use of the commit graph in this process when parsing a + * "struct commit". + */ +void disable_commit_graph(struct repository *r); + #endif |