-
Notifications
You must be signed in to change notification settings - Fork 402
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
avoid the display issue with git add -p without losing CR #1000
base: main
Are you sure you want to change the base?
Conversation
I found that
is needed... |
Ho @yoichi, I think patching bytelines, or not using bytelines, are good ideas. The bytelines author was very helpful when I contacted them about an issue. Not using it does make sense though, since it's not a mainstream library. I think the reason I started using it was to support non-utf8 encoded input. I'll find the relevant issues. |
See #188 for encoding discussion. I think I never finished the work discussed. |
bytelines allows us to output lossy decoding. Before bytelines I was doing this, which meant an error message would appear in the middle of user's output: 9d1aafe We should look how other Rust projects deal with non utf8 input; do they not use |
There seems need to a new issue (or #754 probably) to discuss how to preserve CR. |
I have to say my instinct is that this doesn't feel like the right solution. But I don't think I have the problem clear in my mind so I'm sorry to say something vague like that. I don't really want to make delta's instructions for What is this there about this problem that is specific to |
The problem specfic to After I've read the following comment from @dandavison on #754
then I came up with an idea: we can choose delta's bahavior that it always translate control characters in its output |
In 4ac5035, I've removed the option caret-encode added in this PR. Note
|
Solve #664 without losing CRs in delta's output.
This will also show other control characters in the output of
git add-p
.It partially fixes #754
There remains a problem on preserving CRs in delta's input.