]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commita6aeb2fef9850e05c51e36a8c05b019e2954b2ef
tree313a06c36dc37a83b2e504abd269601cd82ec526
parenta5b4466536668ce595300de249412b2c5b97deb1
parente0ad13977a7f6226d753ec12aedaaa9db7e57dad
Merge branch 'jc/resolve-undo' into maint

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
revision.c