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

Updating .gitattributes for additional file types #1727

Merged
merged 3 commits into from
Dec 17, 2021
Merged

Updating .gitattributes for additional file types #1727

merged 3 commits into from
Dec 17, 2021

Conversation

saratvemulapalli
Copy link
Member

@saratvemulapalli saratvemulapalli commented Dec 14, 2021

Description

Updating .gitattributes for additional file types.

With exiting .gitattributes, Linux is seeing unexpected changes:

On branch main
Your branch is up to date with 'origin/main'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   buildSrc/src/main/resources/cacerts.bcfks
	modified:   client/rest/src/test/resources/test.crt
	modified:   gradlew.bat
	modified:   libs/ssl-config/src/test/resources/certs/ca-all/ca.p12
	modified:   plugins/ingest-attachment/licenses/commons-collections4-LICENSE.txt
	modified:   plugins/ingest-attachment/licenses/commons-collections4-NOTICE.txt
	modified:   plugins/ingest-attachment/licenses/slf4j-api-LICENSE.txt
	modified:   plugins/ingest-attachment/licenses/xz-LICENSE.txt
	modified:   plugins/ingest-attachment/licenses/xz-NOTICE.txt
	modified:   plugins/repository-hdfs/licenses/commons-codec-LICENSE.txt
	modified:   plugins/repository-hdfs/licenses/commons-codec-NOTICE.txt
	modified:   server/licenses/joda-time-LICENSE.txt

Tested on Linux, and MacOS.

Issues Resolved

#1713

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>
Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>
@saratvemulapalli saratvemulapalli requested a review from a team as a code owner December 14, 2021 22:17
@opensearch-ci-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Check success 7c414ed
Log 1492

Reports 1492

@saratvemulapalli
Copy link
Member Author

@reta can you help verify this on a Windows machine?

@@ -1,8 +1,12 @@
* text eol=lf
*.bat text eol=crlf
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm ... why changing that? *.bat are 100% Windows specific, where crlf rules

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some how linux is unhappy with modified: gradlew.bat

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably need to find out why, Windows users might not like it since not all editors on Windows support Linux style, mind if I take a look tomorrow? Thank you.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Absolutely, I'll hold this PR and I'll take a look as well. Thanks @reta !

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@saratvemulapalli totally forgot about this one, sorry, looking ...

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, nonetheless it looks a bit weird, the binary does not hurt, let's try it out

Copy link
Member Author

@saratvemulapalli saratvemulapalli Dec 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah lets give it a shot, feels like all platforms are happy. We can always change it.
Thanks @reta !

@reta
Copy link
Collaborator

reta commented Dec 15, 2021

@reta can you help verify this on a Windows machine?

Looks fine, thanks @saratvemulapalli

PS C:\Users\user\Downloads> git clone https://github.com/saratvemulapalli/OpenSearch
Cloning into 'OpenSearch'...
remote: Enumerating objects: 1374827, done.
remote: Counting objects: 100% (13286/13286), done.
remote: Compressing objects: 100% (6684/6684), done.
remote: Total 1374827 (delta 5260), reused 11352 (delta 4718), pack-reused 1361541
Receiving objects: 100% (1374827/1374827), 501.67 MiB | 6.42 MiB/s, done.
Resolving deltas: 100% (772434/772434), done.
Updating files: 100% (10058/10058), done.
PS C:\Users\user\Downloads> cd .\OpenSearch\
PS C:\Users\user\Downloads\OpenSearch> git status
On branch main
Your branch is up to date with 'origin/main'.

nothing to commit, working tree clean

@dblock dblock merged commit 4a82eb9 into opensearch-project:main Dec 17, 2021
saratvemulapalli added a commit that referenced this pull request Dec 17, 2021
* Updating .gitattributes for additional types

Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>
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.

5 participants