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

mismatched output from interactive.diffFilter when adding the existence of new files #498

Open
llakala opened this issue Nov 15, 2024 · 2 comments
Labels

Comments

@llakala
Copy link

llakala commented Nov 15, 2024

I've been testing the --patch mode for a couple of days with good results in almost all cases. The only problem I've found is when you do the following:

1. Create a new file with content

2. Use `git add --intent-to-add /path/to/file`

3. Now `git add -p` fails with the error below
fatal: mismatched output from interactive.diffFilter
hint: Your filter must maintain a one-to-one correspondence
hint: between its input and output lines.

Originally posted by @wvega-godaddy in #35 (comment)

Having the same issue here, on Git 2.47.0 and diff-so-fancy 1.4.4. I use --intent-to-add all the time in NixOS, because any untracked files are ignored by the system. Would love to see this fixed.

@llakala llakala changed the title mismatched output from interactive.diffFilter when triggering existence of new files mismatched output from interactive.diffFilter when adding the existence of new files Nov 15, 2024
@OJFord
Copy link
Member

OJFord commented Nov 19, 2024

And you do have git config --global interactive.diffFilter 'diff-so-fancy --patch' set?

@llakala
Copy link
Author

llakala commented Nov 19, 2024

And you do have git config --global interactive.diffFilter 'diff-so-fancy --patch' set?

Yes, see this Asciinema for a demonstration of how to replicate the issue.

@OJFord OJFord added the bug label Nov 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

2 participants