Fix File Not Found error when git pull [INS-1940]#9613
Merged
Conversation
✅ Circular References ReportGenerated at: 2026-02-09T03:48:12.243Z Summary
Click to view all circular references in PR (78)Click to view all circular references in base branch (78)Analysis✅ No Change: This PR does not introduce or remove any circular references. This report was generated automatically by comparing against the |
yaoweiprc
changed the title
CurryYangxx
approved these changes
Feb 2, 2026
pavkout
approved these changes
Feb 2, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes a Windows-specific NotFoundError during pull/merge conflict handling by ensuring blob paths are constructed using POSIX separators, aligning with isomorphic-git’s expected filepath format.
Changes:
- Use
path.posix.joinwhen building tree-walk paths so map keys are POSIX-style blob paths. - Add additional console logging when
MergeConflictErroris detected during pull and manual merge fallback.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
1483
to
1486
| for (const entry of entries) { | ||
| const filepath = path.join(prefix, entry.path); | ||
| const filepath = path.posix.join(prefix, entry.path); | ||
| if (entry.type === 'tree') { | ||
| const { tree: subtree } = await git.readTree({ ...baseOpts, oid: entry.oid }); |
There was a problem hiding this comment.
Consider adding a regression test for this Windows-specific path separator issue. The previous implementation used path.join, which yields \\ on Windows and can cause git.readBlob({ filepath }) to throw NotFoundError. Since CI may not run on Windows, a deterministic test could mock node:path so that join behaves like path.win32.join, then assert that getTreeMap() produces keys with forward slashes (or that downstream readBlob calls receive posix-style filepath).
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.
The keys in the map constructed within findConflictLikeChanges represent blob paths. We should use forward slashes as separators; otherwise, git.readBlob will throw a NotFoundError later on.
