]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/resolve-undo'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2022 23:40:16 +0000 (16:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2022 23:40:16 +0000 (16:40 -0700)
The resolve-undo information in the index was not protected against
GC, which has been corrected.

* 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