Repository navigation
Pin the a/ and b/ prefixes on every Git patch local-vcs reads - #1546
Open
JaynouOliver wants to merge 1 commit into
Open
JaynouOliver wants to merge 1 commit into
JaynouOliver wants to merge 1 commit into
Conversation
JaynouOliver
marked this pull request as ready for review
November 14, 2026 23:01
`splitGitPatchFiles` strips a leading `a/` or `b/` from patch paths, but `diff.mnemonicPrefix`, `diff.noprefix` and `diff.srcPrefix` / `diff.dstPrefix` in the user's Git config change those prefixes, so paths came back as `w/src/app.ts` or lost a top-level `a/` directory. Pass `--src-prefix=a/ --dst-prefix=b/` to `git diff`, which wins over all three settings.
JaynouOliver
force-pushed
the
fix/pin-git-diff-prefixes
branch
from
November 17, 2026 05:33
806807c to
409c853
Compare
This branch has not been deployed
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.
readGitDiffrunsgit diffunder the user's Git config, andsplitGitPatchFilesfinds paths by strippinga/orb/. Withdiff.mnemonicPrefix=trueevery working-tree path comes back asw/src/app.ts; withdiff.noprefix=truea file under a top-levela/directory loses it (a/util.tsbecomesutil.ts).diff.srcPrefix/diff.dstPrefixdo the same.The fix passes
--src-prefix=a/ --dst-prefix=b/to thatgit diff, which overrides all three settings.Tested with
pnpm --filter @dev.fast/local-vcs test: the new test inworking-diff.test.tsfails for both settings without the change (2 failed | 3 passed) and the package passes with it (81 passed | 5 skipped).Not verified:
diff.srcPrefix(my Git is 2.43), the fullpnpm run ci, and a running Desktop. There is no issue for this; I found it reading the code.