-
Notifications
You must be signed in to change notification settings - Fork 39
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use git diff for diffs #150
Merged
Merged
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 2024: to repro, run The bug turned out to be that |
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 right
git diff --no-index --raw left right
This eliminates a bunch of code, gets us much better diffs and lots more options.
The one downside is that we have to invokegit difftool
with--no-symlinks
. This means that you can't make changes to unstaged files after runninggit webdiff
and reload to see the changes. This is a fundamental issue with howgit diff --no-index
handles symlinks, see https://public-inbox.org/git/1489877673.24742.1.camel@kaarsemaker.net/t/Update two years later: I hacked around this by making a copy of any directory containing symlinks before passing it to
git diff --no-index (dir1) (dir2)
. When I invokegit diff --no-index (file1) (file2)
, I resolve the two files in case they're symlinks. This mostly lets us have our cake and eat it, too. I can see two flaws, though:git webdiff
. I think this was an issue with old webdiff, too, though.git webdiff
shows will diverge from what you see fromgit diff
, GitHub, etc. We might be able to avoid this by being careful about which symlinks we resolve. But I'd like to see this be a real issue before spending time on it.I also took the opportunity to update a few dependencies and plug in a system for options using
.gitconfig
.Fixes #7
Fixes #82
Fixes #100
Closes #120
Fixes #121
Closes #129