diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-10-07 05:32:55 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-07 05:32:55 +0300 |
| commit | 098e8c6716b8c6abc29b6788acdb3ac8725f835d (patch) | |
| tree | 1380bdbd3b2c5623c20fb2c5a8064bbeeb0fe7be /repository.h | |
| parent | 37ab7cb0a8e12d7f6e8e994cab48bc2383e03105 (diff) | |
| parent | 6abada1880156df9c6a0de91fb23716e378e13d7 (diff) | |
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 'repository.h')
| -rw-r--r-- | repository.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/repository.h b/repository.h index fe0b5f5dc6..fe42197813 100644 --- a/repository.h +++ b/repository.h @@ -125,6 +125,9 @@ struct repository { /* A unique-id for tracing purposes. */ int trace2_repo_id; + /* True if commit-graph has been disabled within this process. */ + int commit_graph_disabled; + /* Configurations */ /* Indicate if a repository has a different 'commondir' from 'gitdir' */ |