fix(importer): clean untracked files after checkout in reconciler#5440
Merged
another-rex merged 1 commit intoMay 26, 2026
Merged
Conversation
another-rex
commented
May 26, 2026
Contributor
Author
There was a problem hiding this comment.
I'm not sure whether we should even have this test.
michaelkedar
approved these changes
May 26, 2026
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.
In
handleReconcileGit, after checking out the target branch, clean up any untracked files and directories to ensure a clean state and avoid processing stale/deleted files.This extends commit 828810a.
Key Changes:
handleReconcileGitto use systemgit checkoutandgit clean -fdxcommands instead ofgo-gitlibrary calls. This is much more robust and avoids potential out-of-memory or timeout issues withgo-git'sStatus()on large repositories when deployed.repoGroup.Doand protected them withrepo.mulock to avoid incorrect state when concurrent imports and reconciles occur.TestHandleReconcileGit_CleanUntrackedto verify that untracked files and directories are correctly cleaned up.agy