]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/resolve-undo' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Aug 2022 04:52:32 +0000 (21:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Aug 2022 04:52:32 +0000 (21:52 -0700)
The resolve-undo information in the index was not protected against
GC, which has been corrected.
source: <xmqq35f7kzad.fsf@gitster.g>

* jc/resolve-undo:
  fsck: do not dereference NULL while checking resolve-undo data
  revision: mark blobs needed for resolve-undo as reachable

1  2 
revision.c

diff --cc revision.c
Simple merge