-
Notifications
You must be signed in to change notification settings - Fork 356
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鈥檒l occasionally send you account related emails.
Already on GitHub? Sign in to your account
馃悰 delta won't show diffs of files marked as autogenerated with .gitattributes
even though they're text files
#1623
Comments
By unsetting the If you want to skip these diffs on GitHub, but generate them locally, I guess you could have another attributes file, not included in version control, where you tell |
I did think that is the case, does that imply then that vscode is behaving how I want due to the fact that it's probably behaving incorrectly? |
I don't use vscode myself, but I would imagine it talks with git to be helpful, and not necessarily promises to follow all the rules. |
@imbrish I have a similar issue and a scenario which I believe to be relevant here: I have generated files which are committed to a repo. Those files are marked as binary mainly to tell git to not perform any kind of merging on those files. It also hides the diffs on Github/Gitlab which is useful as they should not be reviewed/edited when merging. However locally, there a few times where I do need to look at the code generation process and investigate what changed in those files. I can easily do this with I want to use delta to do a diff between two generation versions of my files in two separate dir. Ideally I'd like to do
which works but is a bit cumbersome. I believe the issue is here where
which would look like |
The gitattributes are applied to the output before it is sent to However, in your specific case, @0xjac, PR #1697 will add an option so you can call |
@th1000s I missed that PR. Thanks a lot, it seems perfect. I'll wait for it to be released. 馃殌 |
(You can use
git --no-pager
to produce the raw text output.) - I tried this but it wasn't workingThanks for filing a Delta bug report!
We use
.gitattributes
on our project to mark certain files as autogenearted, so in Github they are not expanded when the revieiwer is looking at the code. This could be to mark output js files transpiled from ts files, or autogenerated markdown files.An example of the file to mark the markdown files.
In diff tools such as vscode I get expected diff output still, but delta just gives me info about how this is a binary file and I can't see the diff.
Output from delta:
Output with vscode diff vieiwer (this is what I expect)
I understand that if I use the standard
git diff
without delta that it has the same issue, so the answer might be that this isn't possible. I just think there could be a way (potentially enabled with an option) if other tools can manage it.The text was updated successfully, but these errors were encountered: