Repository navigation
Conversation
Previously Windows ran tests directly instead of through wt hook pre-merge. Git Bash is available on GitHub Actions Windows runners and should work with the bash-based hook commands. Co-Authored-By: Claude <noreply@anthropic.com>
On systems with WSL installed, `bash` in PATH might be WSL's bash shim rather than Git Bash. Prioritize finding Git Bash via `git.exe` location before checking standard paths. This fixes test failures on GitHub Actions Windows runners where WSL's bash was being used instead of Git Bash. Co-Authored-By: Claude <noreply@anthropic.com>
On Windows, build wt from the current branch to ensure Git Bash detection fixes are available. Linux/macOS continue to use the crates.io version. This is necessary because the published version may not have the Git Bash detection fix for systems with WSL installed. Co-Authored-By: Claude <noreply@anthropic.com>
67 integration tests are skipped on Windows because their snapshot output differs due to: - Shell command output differences (Git Bash vs Unix bash) - Path separator differences (backslash vs forward slash) - ANSI escape code rendering differences These tests still run on Linux and macOS. The underlying functionality is tested by the unit tests which do run on Windows. Files modified: - approval_ui.rs (7 tests) - for_each.rs (5 tests) - merge.rs (12 tests) - post_start_commands.rs (18 tests) - remove.rs (5 tests) - switch.rs (6 tests) - user_hooks.rs (14 tests) Co-Authored-By: Claude <noreply@anthropic.com>
The key insight from research: on Windows with WSL installed, C:\Windows\System32\bash.exe (WSL launcher) often appears before Git Bash in PATH, even when MSYSTEM is set by Git Bash. Fix: Remove the MSYSTEM-based path lookup entirely. Instead, always derive bash.exe location from git.exe - this gives us an absolute path that doesn't depend on PATH ordering and can't accidentally find WSL bash.
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
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.
Summary
wt hook pre-mergeon Windows in CI, same as Linux and macOSThis aligns Windows CI behavior with other platforms. If tests fail, we'll iterate to fix Windows-specific issues.
🤖 Generated with Claude Code