summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Tao Klerks <tao@klerks.biz>2022-02-27 21:57:00 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-02-28 10:02:18 -0800
commit37482b4080b2e965cedfd85bab5fef2feb415992 (patch)
tree746449ebb50fa1db529308dfc471ad0d59334f1d
parentt7519: avoid file to index mtime race for untracked cache (diff)
downloadtgif-37482b4080b2e965cedfd85bab5fef2feb415992.tar.xz
t7519: populate untracked cache before test
In its current state, the t7519 test dealing with untracked cache assumes that "git update-index --untracked-cache" will *populate* the untracked cache. This is not correct - it will only add an empty untracked cache structure to the index. If we're going to compare two git status runs with something interesting happening in-between, we need to ensure that the index is in a stable/steady state *before* that first run. Achieve this by adding another prior "git status" run. At this stage this change does nothing, because there is a bug, addressed in the next patch, whereby once the empty untracked cache structure is added by the update-index invocation, the untracked cache gets updated in every subsequent "git status" call, but the index with these updates does not get written down. That bug actually invalidates this entire test case - but we're fixing that next. Signed-off-by: Tao Klerks <tao@klerks.biz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t7519-status-fsmonitor.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh
index 3f984136ea..fffc57120d 100755
--- a/t/t7519-status-fsmonitor.sh
+++ b/t/t7519-status-fsmonitor.sh
@@ -341,6 +341,7 @@ test_expect_success UNTRACKED_CACHE 'ignore .git changes when invalidating UNTR'
git config core.fsmonitor .git/hooks/fsmonitor-test &&
git update-index --untracked-cache &&
git update-index --fsmonitor &&
+ git status &&
GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace-before" \
git status &&
test-tool dump-untracked-cache >../before