From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Mar 2021 22:25:37 +0000 (-0700)
Subject: Merge branch 'js/fsmonitor-unpack-fix'
X-Git-Tag: v2.31.1~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1dd4e7452295618b20703deffc4241bf7dd4be4f;p=thirdparty%2Fgit.git

Merge branch 'js/fsmonitor-unpack-fix'

The data structure used by fsmonitor interface was not properly
duplicated during an in-core merge, leading to use-after-free etc.

* js/fsmonitor-unpack-fix:
  fsmonitor: do not forget to release the token in `discard_index()`
  fsmonitor: fix memory corruption in some corner cases
---

1dd4e7452295618b20703deffc4241bf7dd4be4f