diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-21 08:07:51 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-21 08:07:51 +0300 |
| commit | c9fdbca92c66b93f95a19bf1f38ab9088db78540 (patch) | |
| tree | b0aaedc6f6c92d0de8a8fe49a19f8522653bcd96 /t/t7519-status-fsmonitor.sh | |
| parent | e05336bddacb90cf243aacc0f7b7f34f900453d7 (diff) | |
| parent | 1fff303fc2b31d5005f38f55f38c4e8521da5a93 (diff) | |
Merge branch 'av/fsmonitor'
Various fixes to bp/fsmonitor topic.
* av/fsmonitor:
fsmonitor: simplify determining the git worktree under Windows
fsmonitor: store fsmonitor bitmap before splitting index
fsmonitor: read from getcwd(), not the PWD environment variable
fsmonitor: delay updating state until after split index is merged
fsmonitor: document GIT_TRACE_FSMONITOR
fsmonitor: don't bother pretty-printing JSON from watchman
fsmonitor: set the PWD to the top of the working tree
Diffstat (limited to 't/t7519-status-fsmonitor.sh')
| -rwxr-xr-x | t/t7519-status-fsmonitor.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh index c6df85af5e..eb2d13bbcf 100755 --- a/t/t7519-status-fsmonitor.sh +++ b/t/t7519-status-fsmonitor.sh @@ -301,4 +301,17 @@ do done done +# test that splitting the index dosn't interfere +test_expect_success 'splitting the index results in the same state' ' + write_integration_script && + dirty_repo && + git update-index --fsmonitor && + git ls-files -f >expect && + test-dump-fsmonitor >&2 && echo && + git update-index --fsmonitor --split-index && + test-dump-fsmonitor >&2 && echo && + git ls-files -f >actual && + test_cmp expect actual +' + test_done |