Merge branch 'jk/disable-commit-graph-during-upload-pack'
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 Oct 2019 02:32:55 +0000 (11:32 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Oct 2019 02:32:55 +0000 (11:32 +0900)
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

1  2 
commit-graph.c
repository.h
t/t5500-fetch-pack.sh
upload-pack.c

diff --cc commit-graph.c
Simple merge
diff --cc repository.h
Simple merge
Simple merge
diff --cc upload-pack.c
Simple merge