-
Notifications
You must be signed in to change notification settings - Fork 30
Added .gitattributes #111
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
base: main
Are you sure you want to change the base?
Added .gitattributes #111
Conversation
Updated to avoid requirement for large commit, also added six files which have mixed end-of-line within the same file. Diff which ignores eol changes can be viewed at https://github.com/OpenIntegrationEngine/engine/pull/111/files?w=1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The mixed eol commits that rewrite a significant part of the file are what I was originally concerned about in my comments in #110 . I've since learned about .git-blame-ignore-revs
, which supposedly is supported by github, so I'm planning to test that out.
Assuming it works, then my concern about the git blame will not be an issue when we fully normalize as you had suggested in the issue. The only issue at that point is that we'd be creating merge conflicts for any sharing between forks if the other forks do not normalize as well.
Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>
Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>
Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>
7293d9a
to
f20c4ed
Compare
@tonygermano, I did look at git-blame-ignore-revs, but since it only applies in a non-default configuration, did not include it. If the issue is limited to the 6-files, it is still valuable to merge without that to prevent further issues in the future. The 6-file count is reduced from the original 600 that |
Add .gitattributes to ensure EOL is reasonable for new files
Re: #110.
Should not be merged withoutgit add --renormalize .
commit. For an example commit, see https://github.com/OpenIntegrationEngine/engine/compare/main...mgaffigan:feature/add-gitattributes-renormalize?expand=1&w=1Renormalize requirement avoided in e0989b4. See discussion in issue for cause.