diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-11 04:52:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-11 04:52:32 (GMT) |
| commit | a6aeb2fef9850e05c51e36a8c05b019e2954b2ef (patch) | |
| tree | 313a06c36dc37a83b2e504abd269601cd82ec526 /xdiff/xmacros.h | |
| parent | a5b4466536668ce595300de249412b2c5b97deb1 (diff) | |
| parent | e0ad13977a7f6226d753ec12aedaaa9db7e57dad (diff) | |
| download | git-a6aeb2fef9850e05c51e36a8c05b019e2954b2ef.zip git-a6aeb2fef9850e05c51e36a8c05b019e2954b2ef.tar.gz git-a6aeb2fef9850e05c51e36a8c05b019e2954b2ef.tar.bz2 | |
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
Diffstat (limited to 'xdiff/xmacros.h')
0 files changed, 0 insertions, 0 deletions