Hi Jacques, all, this seems to introduce problems when merging or checking out branches.
With the .gitattributes and text=auto present git automatically converts files which have other settings in the repository. It happens that git then reports changes for files which were not edited locally. I experienced the problem which is decribed in [1] while merging within a customer project.
It is recommended to renormalize the files in the repository like it is decribed in [2].
Is there someone who has already experienced similar problems? Best regards, Michael Brohl ecomify GmbH - www.ecomify.de [1] https://stackoverflow.com/questions/1967370/git-replacing-lf-with-crlf[2] https://help.github.com/en/github/using-git/configuring-git-to-handle-line-endings#refreshing-a-repository-after-changing-line-endings
Am 19.12.19 um 13:15 schrieb jler...@apache.org:
This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new b424d26 Improved: Equivalent of svn:auto-props properties on the server (OFBIZ-OFBIZ-11279) b424d26 is described below commit b424d2683e0679aeb4d49d3a28a2a682eed50b48 Author: Jacques Le Roux <jacques.le.r...@les7arts.com> AuthorDate: Thu Dec 19 13:15:10 2019 +0100 Improved: Equivalent of svn:auto-props properties on the server (OFBIZ-OFBIZ-11279)We should have an equivalent of svn:auto-props properties on the server:https://help.github.com/articles/dealing-with-line-endings/#per-repository-settings --- .gitattributes | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..2865b16 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,41 @@ +# Set the default behavior, in case people don't have core.autocrlf set. +* text=auto + +# Explicitly declare text files to always be normalized and converted +# to native line endings on checkout. +*.java text +*.groovy text +*.jsp text +*.ftl text +*.js text +*.sql text +*.txt text +*.properties text +*.xml text +*.xsl text +*.xsd text +*.html text +*.htm text +*.css text +*.gradle text +*.md text +Makefile text +README text +NOTICE text +LICENSE text +rc.ofbiz.* text +*.less text +*.adoc text +*.sh text + +# Declare files that will always have CRLF line endings on checkout. +*.bat text eol=crlf + +# Denote all files that are truly binary and should not be modified. +*.png binary +*.jpg binary +*.gif binary +*.tif binary +*.zip binary +*.jks binary +*.ttf binary
smime.p7s
Description: S/MIME Cryptographic Signature
