diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-02 10:53:19 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-02 10:53:19 +0300 |
| commit | 2fd4378d64dae6895f1a98b721fe0ed0f0d552b0 (patch) | |
| tree | 5a2b89f21d681ff391800c916fd27af116184f79 /t | |
| parent | 56ee4a35786016fcf4e34b64e2d29d53fb664c1a (diff) | |
| parent | 6a044a20480a8ef56f7ddb8142f660ca01a3391e (diff) | |
Merge branch 'js/diff-cached-fsmonitor-fix' into maint-2.42
"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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7527-builtin-fsmonitor.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t7527-builtin-fsmonitor.sh b/t/t7527-builtin-fsmonitor.sh index 0c241d6c14..78503158fd 100755 --- a/t/t7527-builtin-fsmonitor.sh +++ b/t/t7527-builtin-fsmonitor.sh @@ -809,6 +809,11 @@ my_match_and_clean () { status --porcelain=v2 >actual.without && test_cmp actual.with actual.without && + git -C super --no-optional-locks diff-index --name-status HEAD >actual.with && + git -C super --no-optional-locks -c core.fsmonitor=false \ + diff-index --name-status HEAD >actual.without && + test_cmp actual.with actual.without && + git -C super/dir_1/dir_2/sub reset --hard && git -C super/dir_1/dir_2/sub clean -d -f } |