Skip to content

Conversation

@Andrej730
Copy link
Contributor

I'm having huge trouble switching between branches on Windows after 1174c49 - autocrlf, that's used on Windows, is fighting against entire repo marked as LF by .gitattributes settings (since it's marking files as LF not just on index but on the work folder too).
This shouldn't be necessary - * text=auto makes git autodetect files as text and then they're handled by core.eol, which is native by default - native means to use platform's line endings locally (crlf on Windows and lf on unix) and commit to index as lf. Or if .gitattributes overrides it, then different line endings will be used locally - e.g. *.sh text eol=lf stores .sh files as lf even on Windows, since it's necessary.
See https://git-scm.com/docs/git-config#Documentation/git-config.txt-coreeol

Also noticed some files on index were stored as crlf - it seems it was by accident, renormalizing them for consistency.

git ls-files --eol | grep i/crlf
# i/crlf  w/crlf  attr/text=auto          tests/python/fake_bpy_module_test/fake_bpy_module_test/analyzer_test_data/base_analyzer_test/input/only_module_class.rst
# i/crlf  w/crlf  attr/text=auto          tests/python/fake_bpy_module_test/fake_bpy_module_test/generator_test_data/code_document_node_translator_test/expect/basic/basic.py
# i/crlf  w/crlf  attr/text=auto          tests/python/fake_bpy_module_test/fake_bpy_module_test/transformer_test_data/bpy_module_tweaker/expect/add_bpy_ops_override_parameters.xml
# i/crlf  w/crlf  attr/text=auto          tests/python/fake_bpy_module_test/fake_bpy_module_test/transformer_test_data/bpy_module_tweaker/expect/add_bpy_ops_override_parameters_transformed.xml
# i/crlf  w/crlf  attr/text=auto          tests/python/fake_bpy_module_test/fake_bpy_module_test/transformer_test_data/bpy_module_tweaker/expect/add_bpy_ops_override_parameters_transformed_before_v4.xml
# i/crlf  w/crlf  attr/text=auto          tests/python/fake_bpy_module_test/fake_bpy_module_test/transformer_test_data/mod_applier_test/expect/new_data.mod.xml
# i/crlf  w/crlf  attr/text=auto          tests/python/fake_bpy_module_test/fake_bpy_module_test/transformer_test_data/mod_applier_test/expect/update_data.mod.xml

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.

1 participant