We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
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
Describe the bug Can't stage lines when using custom textconv diff driver. Either garbage gets applied or an error appears.
error: patch failed: cp866.txt:1 error: cp866.txt: patch does not apply
To Reproduce Steps to reproduce the behavior:
[diff "my-diff-cp866"] textconv = "iconv -f cp866"
cd "$(mktemp -d)" && echo "*.txt text diff=my-diff-cp866" >> .gitattributes && git init && echo -e "КОТ1\\nКОТ2" > utf8.txt && echo -e "КОТ1\\nКОТ2" | iconv -t cp866 > cp866.txt
lazygit
Expected behavior A line is staged.
Version info: commit=, build date=, build source=nix, version=0.45.0, os=linux, arch=amd64, git version=2.47.0
commit=, build date=, build source=nix, version=0.45.0, os=linux, arch=amd64, git version=2.47.0
Additional context Perhaps wherever lazygit invokes git-diff with --no-ext-diff it should also use --no-textconv.
--no-ext-diff
--no-textconv
The text was updated successfully, but these errors were encountered:
No branches or pull requests
Describe the bug
Can't stage lines when using custom textconv diff driver. Either garbage gets applied or an error appears.
To Reproduce
Steps to reproduce the behavior:
cd "$(mktemp -d)" && echo "*.txt text diff=my-diff-cp866" >> .gitattributes && git init && echo -e "КОТ1\\nКОТ2" > utf8.txt && echo -e "КОТ1\\nКОТ2" | iconv -t cp866 > cp866.txt
lazygit
and try to stage lines in cp866.txt and utf8.txtFirst time stages garbage. Second time gives an error.
Expected behavior
A line is staged.
Screenshots
Version info:
commit=, build date=, build source=nix, version=0.45.0, os=linux, arch=amd64, git version=2.47.0
Additional context
Perhaps wherever lazygit invokes git-diff with
--no-ext-diff
it should also use--no-textconv
.The text was updated successfully, but these errors were encountered: