[pull] master from microsoft:master#84
Merged
Merged
Conversation
MountNewWorktree() in the post-command hook silently discarded the exit code of 'gvfs mount', leaving worktrees unprojected when concurrent adds caused mount contention. Also discarded the git checkout exit code. Product fix: - Check git checkout exit code; skip mount on failure - Check gvfs mount exit code with retry (2 retries, 100ms/250ms) - Extract and check --exit_code from hook args to skip post-processing when the git command itself failed - Return int? from GetHookExitCode so callers decide null semantics - Apply same TryMountWithRetry to MountMovedWorktree - Remount old worktree when 'git worktree move' fails (pre-hook unmounts) - Remove maxRetries parameter; retry count driven by delay array length - Emit actionable warning to stderr on mount failure with recovery command Test fix: - Increase concurrent worktrees from 2 to ProcessorCount for reliable mount contention - Use CountdownEvent barrier for tight synchronization of launches - Add pipe-based mount verification as primary assertion (probes the worktree-specific named pipe directly instead of relying on File.Exists) - Add diagnostic capture on failure (directory listing, .git contents) - Use dynamic branch names with GUID suffixes to avoid collisions - Use numeric indices instead of char arithmetic for labels/paths to support >26 concurrent worktrees - Only retry at lower concurrency when ALL failures are overload-related; mixed failure sets (overload + real regression) are reported immediately Bug: https://dev.azure.com/microsoft/OS/_workitems/edit/61784115 Assisted-by: Claude Opus 4.6 Signed-off-by: Tyrie Vella <tyrielv@gmail.com>
…-mount Improve resiliency of git worktree commands
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
1 participant
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )