]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'us/unpack-trees-fsmonitor'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2019 20:52:48 +0000 (12:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2019 20:52:48 +0000 (12:52 -0800)
Users of oneway_merge() (like "reset --hard") learned to take
advantage of fsmonitor to avoid unnecessary lstat(2) calls.

* us/unpack-trees-fsmonitor:
  unpack-trees: skip stat on fsmonitor-valid files

1  2 
t/t7519-status-fsmonitor.sh
unpack-trees.c

Simple merge
diff --cc unpack-trees.c
Simple merge