]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/diff-cached-fsmonitor-fix' into maint-2.42
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Nov 2023 07:53:19 +0000 (16:53 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Nov 2023 07:53:19 +0000 (16:53 +0900)
"git diff --cached" codepath did not fill the necessary stat
information for a file when fsmonitor knows it is clean and ended
up behaving as if it is not clean, which has been corrected.

* js/diff-cached-fsmonitor-fix:
  diff-lib: fix check_removed when fsmonitor is on

1  2 
diff-lib.c
t/t7527-builtin-fsmonitor.sh

diff --cc diff-lib.c
Simple merge
Simple merge