]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 35381b1 4abc578)
Merge branch 'js/fsmonitor-unpack-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Mar 2021 22:25:37 +0000 (15:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Mar 2021 22:25:37 +0000 (15:25 -0700)
commit1dd4e7452295618b20703deffc4241bf7dd4be4f
treea8390c1f3eafd563988d9c2fafe8ad680d7ecc4btree | snapshot
parent35381b13da846cc6ad620f9f9a5abf1d974d6e9bcommit | diff
parent4abc57848d8ace8218952c7376fa397c0850392ccommit | diff
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
read-cache.c diff1 | diff2 | blob | history
unpack-trees.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.