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

🐛 Delta sometimes duplicates diff entries #1645

Closed
ErrrorMaxx opened this issue Mar 4, 2024 · 1 comment
Closed

🐛 Delta sometimes duplicates diff entries #1645

ErrrorMaxx opened this issue Mar 4, 2024 · 1 comment

Comments

@ErrrorMaxx
Copy link

ErrrorMaxx commented Mar 4, 2024

Result of diff:

diff --git a/.config/cygmoi/chezmoi.yaml b/.config/cygmoi/chezmoi.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e599654dd661f7db269f2190ab7e4d82828a23d6
--- /dev/null
+++ b/.config/cygmoi/chezmoi.yaml
@@ -0,0 +1,1 @@
+sourceDir: /root/.local/share/chezmoi/home
diff --git a/.gnupg/pubring.kbx b/.gnupg/pubring.kbx
index d3e20dd989633f001cfbae9e97abb7867a2d6c67..dc82a6012b1811038b0582698951ec75155a5506 100600
Binary files a/.gnupg/pubring.kbx and b/.gnupg/pubring.kbx differ

When this diff is piped to delta, then result is:

$ delta --no-gitconfig < file

added: .config/cygmoi/chezmoi.yaml
──────────────────────────────

───┐
1: │
───┘
sourceDir: /root/.local/share/chezmoi/home

Binary files a/.gnupg/pubring.kbx and b/.gnupg/pubring.kbx differ
──────────────────────────────

added: .config/cygmoi/chezmoi.yaml
──────────────────────────────

As you can see, added: .config/cygmoi/chezmoi.yaml is somehow listed two times, while in diff it is not.

If I remove diff of .gnupg/pubring.kbx from diff result, then there is no duplicate entries:

$ delta --no-gitconfig < file

added: .config/cygmoi/chezmoi.yaml
──────────────────────────────

───┐
1: │
───┘
sourceDir: /root/.local/share/chezmoi/home
$ delta --version
delta 0.16.5
@dandavison
Copy link
Owner

Thanks @ErrrorMaxx this was fixed recently by @imbrish in #1629 (in main branch, so not released yet)

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

No branches or pull requests

2 participants