Handle dirty working tree when checking out clones#5218
Merged
premun merged 3 commits intodotnet:mainfrom Aug 28, 2025
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a common git checkout failure that occurs when local changes in cloned repositories would be overwritten by checking out to a different commit. The solution implements error handling to clean the working directory when such conflicts arise.
Key changes:
- Adds error handling around git checkout operations to detect overwrite conflicts
- Implements automatic repository cleaning using
git clean -fdqxwhen checkout fails due to dirty working tree - Wraps the checkout logic in try-catch to gracefully handle and resolve the documented exception
src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/CloneManager.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/CloneManager.cs
Outdated
Show resolved
Hide resolved
adamzip
approved these changes
Aug 28, 2025
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.
Resolves the following frequent exception:
We do clean after the checkout but if the repo had all the right refs already and was dirty, it does not work