summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-10-30 06:13:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-30 06:13:14 (GMT)
commit8dc28ee438e9fd968f7a6b079b55e4e07af01dfd (patch)
tree8716a033aa6dc39e1dccfdaecd4fba174ae1083c
parent0d6799e563de1814edd4f659e4aea94b1dfba55b (diff)
parent460782b7be869424ff049350bdcbf151f6beca62 (diff)
downloadgit-8dc28ee438e9fd968f7a6b079b55e4e07af01dfd.zip
git-8dc28ee438e9fd968f7a6b079b55e4e07af01dfd.tar.gz
git-8dc28ee438e9fd968f7a6b079b55e4e07af01dfd.tar.bz2
Merge branch 'wb/fsmonitor-bitmap-fix'
Comment update. * wb/fsmonitor-bitmap-fix: t7519-status-fsmonitor: improve comments
-rwxr-xr-xt/t7519-status-fsmonitor.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh
index d8df990..997d5fb 100755
--- a/t/t7519-status-fsmonitor.sh
+++ b/t/t7519-status-fsmonitor.sh
@@ -354,9 +354,11 @@ test_expect_success 'discard_index() also discards fsmonitor info' '
test_cmp expect actual
'
-# Test staging/unstaging files that appear at the end of the index. Test
-# file names begin with 'z' so that they are sorted to the end of the index.
-test_expect_success 'status succeeds after staging/unstaging ' '
+# Test unstaging entries that:
+# - Are not flagged with CE_FSMONITOR_VALID
+# - Have a position in the index >= the number of entries present in the index
+# after unstaging.
+test_expect_success 'status succeeds after staging/unstaging' '
test_create_repo fsmonitor-stage-unstage &&
(
cd fsmonitor-stage-unstage &&