Merge branch 'wb/fsmonitor-bitmap-fix'

gitster · gitster · commit 8dc28ee438e9 · 2019-10-30T15:13:14.000+09:00
Comment update.

* wb/fsmonitor-bitmap-fix:
  t7519-status-fsmonitor: improve comments
diff --git 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 &&

Original file line number	Diff line number	Diff line change
`@@ -354,9 +354,11 @@ test_expect_success 'discard_index() also discards fsmonitor info' '`
`354`	`354`	`test_cmp expect actual`
`355`	`355`	`'`
`356`	`356`
`357`		`-# Test staging/unstaging files that appear at the end of the index. Test`
`358`		`-# file names begin with 'z' so that they are sorted to the end of the index.`
`359`		`-test_expect_success 'status succeeds after staging/unstaging ' '`
	`357`	`+# Test unstaging entries that:`
	`358`	`+# - Are not flagged with CE_FSMONITOR_VALID`
	`359`	`+# - Have a position in the index >= the number of entries present in the index`
	`360`	`+# after unstaging.`
	`361`	`+test_expect_success 'status succeeds after staging/unstaging' '`
`360`	`362`	`test_create_repo fsmonitor-stage-unstage &&`
`361`	`363`	`(`
`362`	`364`	`cd fsmonitor-stage-unstage &&`