Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Doesn't work with git version 2.37.0 #1114

Closed
boris-petrov opened this issue Jun 28, 2022 · 6 comments
Closed

Doesn't work with git version 2.37.0 #1114

boris-petrov opened this issue Jun 28, 2022 · 6 comments

Comments

@boris-petrov
Copy link

Using delta 0.13.0. I have this in my .gitconfig file:

[interactive]
	diffFilter = delta --color-only

Which worked great when using git add -p. Since version 2.37.0 of git, it blows up:

error: could not parse colored hunk header

And then some random stuff.
@OJFord OJFord mentioned this issue Jun 28, 2022
Closed
@OJFord
Copy link

OJFord commented Jun 28, 2022

Workaround:

[add.interactive]
    useBuiltin = false

(Credit to @malsyned in issue linked above)

cwlbraa added a commit to cwlbraa/delta that referenced this issue Jul 1, 2022
@cwlbraa
Update README.md to include git 2.37.0 workaround
bb9c8ba 
see dandavison#1114
@cwlbraa cwlbraa mentioned this issue Jul 1, 2022
Merged
dandavison pushed a commit that referenced this issue Jul 1, 2022
@cwlbraa
Update README.md to include git 2.37.0 workaround (#1116)
5f8ac5f 
see #1114
rouge8 added a commit to rouge8/dotfiles that referenced this issue Jul 3, 2022
@rouge8
[git] Work around issue with delta and git 2.37.0
dc0f1ba 
dandavison/delta#1114
@phil-blain
Copy link
Contributor

I would say it is a Git regression, and should be reported to the Git mailing list: http://git-scm.com/community.

daGrevis added a commit to daGrevis/Dotfiles that referenced this issue Aug 9, 2022
@daGrevis
Fix "git add -p" not working with latest git/delta
808db2f 
dandavison/delta#1114
@phil-blain
Copy link
Contributor

I would say it is a Git regression, and should be reported to the Git mailing list: http://git-scm.com/community.

Reported here: https://lore.kernel.org/git/[email protected]/T/#u

teekennedy added a commit to teekennedy/dotfiles that referenced this issue Sep 14, 2022
@teekennedy
Add delta workaround for git v2.37.0
854261b 
dandavison/delta#1114
@phil-blain
Copy link
Contributor

Fixed in Git 2.38, out today: https://github.com/git/git/blob/3dcec76d9df911ed8321007b1d197c1a206dc164/Documentation/RelNotes/2.38.0.txt#L353-L356

@boris-petrov
Copy link
Author

Indeed it is! Thanks!

@WhyNotHugo
Copy link

WhyNotHugo commented Oct 5, 2022 via email

rouge8 added a commit to rouge8/dotfiles that referenced this issue Oct 5, 2022
@rouge8
Revert workaround for delta and git 2.37.0
b62a9a4 
dandavison/delta#1114 (comment)
@adamchainz adamchainz mentioned this issue Nov 5, 2022
Merged
@astiob astiob mentioned this issue Feb 28, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
4 participants
@boris-petrov @WhyNotHugo @OJFord @phil-blain