Hi There are instructions on github to reduce this issue:
https://help.github.com/articles/dealing-with-line-endings
In particular it says to:
git rm --cached -r .
# Remove everything from the index.
git reset --hard# Write both the index and working directory from git's database.
git add .# Prepare to make a commit by staging all the files that will get normalized.
# This is your chance to inspect which files were never normalized. You should
# get lots of messages like: "warning: CRLF will be replaced by LF in file."
git commit -m "Normalize line endings"# Commit
JEsse
From: Francois Prunayre <fx.prunayre@anonymised.com>
Sent: March 21, 2013 10:24 AM
To: Devel geonetwork-devel@lists.sourceforge.net
Subject: [GeoNetwork-devel] Introduce end-of-line normalization
Hi, recently we added a .gitattributes file [1] which should help making more homogeneous end-of-lines.
Since yesterday, I’ve some file marked as modified that I do not changes. Jesse and I committed some of them in the last few days. But it looks like new files are marked as modified again and again.
I tried (as mentioned here [2]):
$ rm .git/index # Remove the index to force git to
$ git reset # re-scan the working directory
$ git status # Show files that will be normalized
But then a pretty long list of files [3] are going to be updated and I’m not 100% sure it will clean all end-of-line but for sure, it will make merging more difficult.
What should we do about that ?
Thanks for the feedback.
Francois
[1] https://github.com/geonetwork/core-geonetwork/commit/96b3e0bd7a43d5167be3fd3ac51aae6d2a00be2e
[2] https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
[3]
modified: cachingxslt/src/main/java/de/fzi/dbs/xml/transform/CachingTransformerFactory.java
modified: cswtest/TEST-org.fao.geonet.csw.TestCswIsoApp.xml
modified: jeeves/src/main/java/jeeves/utils/TransformerFactoryFactory.java
modified: oaipmh/src/main/java/org/fao/oaipmh/requests/TokenListRequest.java
modified: sde/src/main/java/com/esri/*
modified: web-client/src/main/resources/apps/css/gnmapdefault.css
modified: web-client/src/main/resources/apps/js/GeoExt/lib/GeoExt/data/FeatureRecord.js
modified: web-client/src/main/resources/apps/js/GeoExt/lib/GeoExt/data/LayerRecord.js
modified: web-client/src/main/resources/apps/js/GeoExt/lib/GeoExt/data/LayerStore.js
modified: web-client/src/main/resources/apps/js/GeoExt/lib/GeoExt/data/ScaleStore.js
modified: web-client/src/main/resources/apps/js/GeoExt/lib/GeoExt/widgets/Action.js
modified: web-client/src/main/resources/apps/js/GeoExt/lib/GeoExt/widgets/LegendImage.js
modified: web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork/Catalogue.js
modified: web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork/form/GeometryMapField.js
modified: web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork/lang/de.js
modified: web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork/lang/en.js
modified: web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork/lang/fr.js
modified: web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork/util/SearchFormTools.js
modified: web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork/widgets/CategoryView.js
modified: web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork/widgets/FacetsPanel.js
modified: web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork/widgets/editor/ConceptSelectionPanel.js
modified: web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork/widgets/editor/EditorTools.js
modified: web-client/src/main/resources/apps/js/OpenLayers/lib/OpenLayers/Format/WMSCapabilities/v1_3.js
modified: web-client/src/main/resources/apps/js/OpenLayers/lib/OpenLayers/Format/WMSCapabilities/v1_3_0.js
modified: web-client/src/main/resources/apps/js/ext/ext-all-debug-w-comments.js
modified: web-client/src/main/resources/apps/js/ext/ext-all-debug.js
modified: web-client/src/main/resources/apps/js/ext/pkgs/cmp-foundation-debug.js
modified: web-client/src/main/resources/apps/search/js/Settings.js
modified: web-client/src/main/resources/apps/search/js/map/Settings.js
modified: web/src/main/java/org/fao/geonet/arcgis/ArcSDEConnection.java
modified: web/src/main/java/org/fao/geonet/arcgis/ArcSDEMetadataAdapter.java
modified: web/src/main/java/org/fao/geonet/csw/common/ConstraintLanguage.java
modified: web/src/main/java/org/fao/geonet/csw/common/CswOperation.java
modified: web/src/main/java/org/fao/geonet/csw/common/ElementSetName.java
modified: web/src/main/java/org/fao/geonet/csw/common/OutputFormatPreference.java
modified: web/src/main/java/org/fao/geonet/csw/common/OutputSchema.java
modified: web/src/main/java/org/fao/geonet/csw/common/OutputSchemaPreference.java
modified: web/src/main/java/org/fao/geonet/csw/common/Section.java
modified: web/src/main/java/org/fao/geonet/csw/common/TypeName.java
modified: web/src/main/java/org/fao/geonet/csw/common/util/Xml.java
modified: web/src/main/java/org/fao/geonet/exceptions/UnAuthorizedException.java
modified: web/src/main/java/org/fao/geonet/guiservices/metadata/Sitemap.java
modified: web/src/main/java/org/fao/geonet/kernel/KeywordBean.java
modified: web/src/main/java/org/fao/geonet/kernel/MetadataIndexerProcessor.java
modified: web/src/main/java/org/fao/geonet/kernel/ThesaurusManager.java
modified: web/src/main/java/org/fao/geonet/kernel/harvest/harvester/arcsde/ArcSDEHarvester.java
modified: web/src/main/java/org/fao/geonet/kernel/harvest/harvester/arcsde/ArcSDEParams.java
modified: web/src/main/java/org/fao/geonet/kernel/harvest/harvester/localfilesystem/LocalFilesystemHarvester.java
modified: web/src/main/java/org/fao/geonet/kernel/harvest/harvester/localfilesystem/LocalFilesystemParams.java
modified: web/src/main/java/org/fao/geonet/kernel/oaipmh/ResumptionTokenCache.java
modified: web/src/main/java/org/fao/geonet/kernel/oaipmh/services/AbstractTokenLister.java
modified: web/src/main/java/org/fao/geonet/kernel/search/GeoNetworkAnalyzer.java
modified: web/src/main/java/org/fao/geonet/kernel/search/LuceneIndexField.java
modified: web/src/main/java/org/fao/geonet/kernel/search/LuceneQueryBuilder.java
modified: web/src/main/java/org/fao/geonet/kernel/search/LuceneUtils.java
modified: web/src/main/java/org/fao/geonet/kernel/search/StopwordFileParser.java
modified: web/src/main/java/org/fao/geonet/services/metadata/BatchOpsMetadataReindexer.java
modified: web/src/main/java/org/fao/geonet/services/notifications/domain/NotificationTarget.java
modified: web/src/main/java/org/fao/geonet/services/thesaurus/Activate.java
modified: web/src/main/java/org/fao/geonet/services/thesaurus/AddElement.java
modified: web/src/main/java/org/fao/geonet/services/thesaurus/Clear.java
modified: web/src/main/java/org/fao/geonet/services/thesaurus/DeleteElement.java
modified: web/src/main/java/org/fao/geonet/services/thesaurus/Download.java
modified: web/src/main/java/org/fao/geonet/services/thesaurus/EditElement.java
modified: web/src/main/java/org/fao/geonet/services/thesaurus/GetKeywordById.java
modified: web/src/main/java/org/fao/geonet/services/thesaurus/GetKeywords.java
modified: web/src/main/java/org/fao/geonet/services/thesaurus/GetList.java
modified: web/src/main/java/org/fao/geonet/services/thesaurus/GetNarrowerBroader.java
modified: web/src/main/java/org/fao/geonet/services/thesaurus/GetSelectedKeywords.java
modified: web/src/main/java/org/fao/geonet/services/thesaurus/List.java
modified: web/src/main/java/org/fao/geonet/services/thesaurus/SelectKeywords.java
modified: web/src/main/java/org/fao/geonet/services/thesaurus/UpdateElement.java
modified: web/src/main/java/org/fao/geonet/services/thesaurus/Upload.java
modified: web/src/main/java/org/fao/geonet/services/util/ServiceMetadataReindexer.java
modified: web/src/main/java/org/fao/geonet/services/util/z3950/SRUArgumentParseException.java
modified: web/src/main/java/org/fao/geonet/services/util/z3950/SRUDiag.java
modified: web/src/main/java/org/fao/geonet/services/util/z3950/SRUParamTestDBO.java
modified: web/src/main/java/org/fao/geonet/services/util/z3950/SRUParamTester.java
modified: web/src/main/java/org/fao/geonet/util/HeapSorter.java
modified: web/src/main/java/org/fao/geonet/util/XMLExtensionFilenameFilter.java
modified: web/src/main/java/org/fao/geonet/util/ZipUtil.java
modified: web/src/main/webResources/WEB-INF/server.prop
modified: web/src/main/webapp/WEB-INF/classes/JZKitConfig.xml.tem
modified: web/src/main/webapp/WEB-INF/classes/schematron/iso_abstract_expand.xsl
modified: web/src/main/webapp/WEB-INF/classes/schematron/iso_dsdl_include.xsl
modified: web/src/main/webapp/WEB-INF/classes/schematron/iso_schematron_message_xslt2.xsl
modified: web/src/main/webapp/WEB-INF/classes/schematron/iso_schematron_skeleton_for_saxon.xsl
modified: web/src/main/webapp/WEB-INF/classes/schematron/iso_svrl_for_xslt2.xsl
modified: web/src/main/webapp/WEB-INF/classes/schematron/readme.txt
modified: web/src/main/webapp/WEB-INF/classes/schematron/sch-messages-ger.xhtml
modified: web/src/main/webapp/WEB-INF/classes/setup/sql/data/loc-pol-default.sql
modified: web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v280/loc-pol-default.sql
modified: web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v280/loc-rus-default.sql
modified: web/src/main/webapp/WEB-INF/config-lucene.xml
modified: web/src/main/webapp/WEB-INF/config-overrides-widget.xml
modified: web/src/main/webapp/WEB-INF/config-security.xml
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/dublin-core/loc/tur/labels.xml
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/fgdc-std/templates/metadata.xml
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19115/loc/nor/codelists.xml
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19115/loc/nor/labels.xml
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19115/present/csw/ogc-brief.xsl
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19115/present/csw/ogc-full.xsl
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19115/present/csw/ogc-summary.xsl
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19115/update-fixed-info.xsl
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/convert/ThreddsDIFToISO/DIFToISO.xsl
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/convert/thesaurus-transformation.xsl
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/index-fields.xsl
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/loc/eng/codelists.xml
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/loc/eng/labels.xml
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/loc/fre/codelists.xml
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/loc/fre/labels.xml
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/present/metadata-edit.xsl
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/gco/gcoBase.xsd
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/gml/basicTypes.xsd
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/gml/coordinateOperations.xsd
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/gml/coordinateReferenceSystems.xsd
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/gml/coordinateSystems.xsd
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/gml/dictionary.xsd
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/gml/direction.xsd
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/gml/geometryAggregates.xsd
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/gml/geometryBasic2d.xsd
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/gml/geometryComplexes.xsd
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/gml/gml.xsd
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/gml/gmlBase.xsd
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/gml/grids.xsd
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/gml/measures.xsd
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/gml/readme.txt
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/gml/referenceSystems.xsd
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/gml/temporalTopology.xsd
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/gml/topology.xsd
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/gml/units.xsd
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/gml/valueObjects.xsd
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/resources/Codelist/ML_gmxCodelists.xml
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/resources/Codelist/gmxCodelists.xml
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/xlink/version.txt
modified: web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/schema/xlink/xlinks.xsd
modified: web/src/main/webapp/WEB-INF/log4j.cfg
modified: web/src/main/webapp/WEB-INF/schemaplugin-uri-catalog.xml
modified: web/src/main/webapp/conversion/iso19115-to-iso19139/iso-mapping.xml
modified: web/src/main/webapp/geonetwork_map.css
modified: web/src/main/webapp/htmlCache/schematronscripts/schematron-frame.html
modified: web/src/main/webapp/htmlCache/schematronscripts/verbid.xsl
modified: web/src/main/webapp/loc/ita/xml/confirm.xml
modified: web/src/main/webapp/loc/ita/xml/feedback-sent.xml
modified: web/src/main/webapp/loc/ita/xml/iso-languages.xml
modified: web/src/main/webapp/loc/ita/xml/metadata-create.xml
modified: web/src/main/webapp/loc/ita/xml/metadata-delete.xml
modified: web/src/main/webapp/loc/ita/xml/metadata-searchunused.xml
modified: web/src/main/webapp/loc/ita/xml/metadata-validate.xml
modified: web/src/main/webapp/loc/ita/xml/password-changed.xml
modified: web/src/main/webapp/loc/ita/xml/validation-error.xml
modified: web/src/main/webapp/loc/pol/xml/about.xml
modified: web/src/main/webapp/loc/pol/xml/help.xml
modified: web/src/main/webapp/loc/pol/xml/iso-languages.xml
modified: web/src/main/webapp/loc/tur/*
modified: web/src/main/webapp/maps/geoserver_localhost.wmc
modified: web/src/main/webapp/modalbox.css
modified: web/src/main/webapp/scripts/editor/metadata-editor.js
modified: web/src/main/webapp/scripts/ext/*
modified: web/src/main/webapp/scripts/form_check.js
modified: web/src/main/webapp/scripts/geo/proj4js-compressed.js
modified: web/src/main/webapp/scripts/geoext/lib/GeoExt/data/FeatureRecord.js
modified: web/src/main/webapp/scripts/geoext/lib/GeoExt/data/LayerRecord.js
modified: web/src/main/webapp/scripts/geoext/lib/GeoExt/data/LayerStore.js
modified: web/src/main/webapp/scripts/geoext/lib/GeoExt/data/ScaleStore.js
modified: web/src/main/webapp/scripts/geoext/lib/GeoExt/widgets/Action.js
modified: web/src/main/webapp/scripts/geoext/lib/GeoExt/widgets/LegendImage.js
modified: web/src/main/webapp/scripts/geonetwork.js
modified: web/src/main/webapp/scripts/harvesting/arcsde/arcsde.js
modified: web/src/main/webapp/scripts/harvesting/arcsde/model.js
modified: web/src/main/webapp/scripts/harvesting/arcsde/view.js
modified: web/src/main/webapp/scripts/harvesting/filesystem/filesystem.js
modified: web/src/main/webapp/scripts/harvesting/filesystem/model.js
modified: web/src/main/webapp/scripts/harvesting/filesystem/view.js
modified: web/src/main/webapp/scripts/lib/.ignore
modified: web/src/main/webapp/scripts/map/lang/no.js
modified: web/src/main/webapp/scripts/ol_map.js
modified: web/src/main/webapp/scripts/ol_minimap.js
modified: web/src/main/webapp/scripts/openlayers/addins/LoadingPanel.js
modified: web/src/main/webapp/scripts/openlayers/addins/ScaleBar.js
modified: web/src/main/webapp/scripts/openlayers/lib/OpenLayers/Format/SOSGetObservation.js
modified: web/src/main/webapp/scripts/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3.js
modified: web/src/main/webapp/scripts/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3_0.js
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
GeoNetwork-devel mailing list
GeoNetwork-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork