Swap diff tool for git #492
Open
Conversation
This file contains 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
go-gitdiff which aspect CLI uses cannot support patches generated by BSD diff which is the default on MacOS (see tagged issue). I am investigating using ape but it requires Bazel 7.4.1 which may be a breaking change. Alternatively, this changes diff -> git with a few extra "hacks". Namely, we need to replace the labels to be the same file and resolve the symlinks otherwise `git diff` thinks the file was deleted. fixes aspect-build#487
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.
go-gitdiff which aspect CLI uses cannot support patches generated by BSD diff which is the default on MacOS (see tagged issue).
I am investigating using ape but it requires Bazel 7.4.1 which may be a breaking change.
Alternatively, this changes diff -> git with a few extra "hacks". Namely, we need to replace the labels to be the same file and resolve the symlinks otherwise
git diffthinks the file was deleted.fixes #487