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.

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

Preserve "Binary files" line in color_only mode #1649

Merged
merged 1 commit into from Mar 12, 2024

Conversation

imbrish
Copy link
Contributor

@imbrish imbrish commented Mar 9, 2024

Command:

printf "\33[1mdiff --git a/a b/a\33[m\n\33[1mindex 7b65664a8972..82c76465611f 100755\33[m\nBinary files a/a and b/a differ\n\33[1mdiff --git a/b b/b\33[m\n\33[1mindex 7b57bd29ea8a..4d3b8c11a4a2 100644\33[m\n\33[1m--- a/b\33[m\n\33[1m+++ b/b\33[m\n\33[36m@@ -1 +1 @@\33[m\n\33[31m-some text\33[m\n\33[32m+\33[m\33[32mother text\33[m\n" | delta --no-gitconfig --color-only

Before:

image

After:

image

Closes #320

@dandavison dandavison merged commit 9b775ec into dandavison:main Mar 12, 2024
12 checks passed
@dandavison
Copy link
Owner

Great, thanks a lot!

@martinetd
Copy link

Thanks!

(I wish github would notify folks following an issue when someone opens a PR that fixes it, not just when it's merged...)

@imbrish imbrish deleted the binary-passthru branch March 12, 2024 18:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

🐛 git add -p one-to-one correspondence errors
3 participants