Use git diff for diffs #150
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
|
TODO: this chops off the last line of files w/o trailing newlines |
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.
git diff --no-index left rightgit diff --no-index --raw left rightThis eliminates a bunch of code, gets us much better diffs and lots more options. The one downside is that we have to invoke
git difftoolwith--no-symlinks. This means that you can't make changes to unstaged files after runninggit webdiffand reload to see the changes. This is a fundamental issue with howgit diff --no-indexhandles symlinks, see https://public-inbox.org/git/1489877673.24742.1.camel@kaarsemaker.net/t/I also took the opportunity to update a few dependencies and plug in a system for options using
.gitconfig.Closes #129
Fixes #100
Closes #120
Fixes #7
Fixes #82
Fixes #121