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 /upload-pack.c | |
| parent | 37ab7cb0a8e12d7f6e8e994cab48bc2383e03105 (diff) | |
| parent | 6abada1880156df9c6a0de91fb23716e378e13d7 (diff) | |
| download | git-098e8c6716b8c6abc29b6788acdb3ac8725f835d.tar.gz | |
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 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/upload-pack.c b/upload-pack.c index 875db92996..a00d7ece6b 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -721,7 +721,7 @@ static void deepen_by_rev_list(struct packet_writer *writer, int ac, { struct commit_list *result; - close_commit_graph(the_repository->objects); + disable_commit_graph(the_repository); result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW); send_shallow(writer, result); free_commit_list(result); |