Fix Windows CI: Add sleep for mtime detection in working tree conflicts test #485
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…licts test The test_list_full_working_tree_conflicts test was failing on Windows CI because git's mtime-based change detection wasn't reliably seeing the file modification. This is due to Windows having lower timestamp resolution in some environments (especially CI). Changes: - Add 100ms sleep on Windows before git update-index refresh - Add diagnostic assertion to verify git detects the change - Update comment to mention Windows alongside macOS Fixes CI failure from commit 53d6409. Co-Authored-By: Claude Sonnet 4.5 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes Windows CI failure from commit 53d6409 (#481).
Problem
The
test_list_full_working_tree_conflictstest was failing on Windows CI because git's mtime-based change detection wasn't reliably seeing file modifications. The test would show status↓(behind) instead of✗(would conflict) because the working tree conflict detection was falling back to commit-level checking.Root Cause
Windows has lower timestamp resolution in some environments (especially CI), which can cause git to miss file changes when they happen quickly after a previous operation. The test writes a file, but git doesn't see it as modified because the mtime matches the index entry.
Solution
git update-index --refreshto ensure mtime differs from indexTesting
Related
This is an automated fix. Please review the approach and test on Windows before merging.