Skip to content

Some files in the repository are saved as CRLF, breaking utilities like patch #1706

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

Closed
C0rn3j opened this issue Dec 8, 2024 · 1 comment
Closed

Comments

@C0rn3j
Copy link
Contributor

C0rn3j commented Dec 8, 2024

I was trying to apply #1683 with patch but it kept failing at:

patching file src/video_core/buffer_cache/buffer_cache.cpp
Hunk #1 FAILED at 360 (different line endings).
Hunk #2 FAILED at 370 (different line endings).

Turns out that this is due to SOME of the files being saved with CRLF line endings.

It would be nice if this was unified and caught in the CI.

dos2unix against them is a workaround to make patch work again.

Complete list:

# find . -not -type d -exec file "{}" ";" | grep ' CRLF '
./src/common/div_ceil.h: C++ source, ASCII text, with CRLF line terminators
./src/common/spin_lock.h: C++ source, ASCII text, with CRLF line terminators
./src/common/spin_lock.cpp: C++ source, ASCII text, with CRLF line terminators
./src/common/ntapi.cpp: C source, ASCII text, with CRLF line terminators
./src/common/unique_function.h: C++ source, ASCII text, with CRLF line terminators
./src/common/ntapi.h: C source, ASCII text, with CRLF line terminators
./src/video_core/buffer_cache/word_manager.h: C++ source, ASCII text, with CRLF line terminators
./src/video_core/buffer_cache/buffer_cache.h: C++ source, ASCII text, with CRLF line terminators
./src/video_core/buffer_cache/buffer.h: C++ source, ASCII text, with CRLF line terminators
./src/video_core/buffer_cache/memory_tracker_base.h: C++ source, ASCII text, with CRLF line terminators
./src/video_core/buffer_cache/buffer_cache.cpp: C++ source, ASCII text, with CRLF line terminators
./src/core/libraries/fiber/fiber.cpp: C source, ASCII text, with CRLF line terminators
./src/core/libraries/fiber/fiber.h: C source, ASCII text, with CRLF line terminators
./src/core/libraries/videodec/videodec2_impl.h: C++ source, ASCII text, with CRLF line terminators
./src/core/libraries/videodec/videodec2.h: C source, ASCII text, with CRLF line terminators
./src/core/libraries/videodec/videodec2_avc.h: C source, ASCII text, with CRLF line terminators
./src/core/libraries/videodec/videodec2_impl.cpp: C source, ASCII text, with CRLF line terminators
./src/core/libraries/videodec/videodec2.cpp: C source, ASCII text, with CRLF line terminators
./src/core/libraries/ime/ime_common.h: C source, ASCII text, with CRLF line terminators
./src/core/libraries/ime/ime_ui.h: C++ source, ASCII text, with CRLF line terminators
./src/core/libraries/ime/ime_ui.cpp: C source, ASCII text, with CRLF line terminators
./src/core/libraries/kernel/sync/semaphore.h: C++ source, ASCII text, with CRLF line terminators
./src/core/libraries/kernel/sync/mutex.cpp: C source, ASCII text, with CRLF line terminators
./src/core/libraries/kernel/sync/mutex.h: C++ source, ASCII text, with CRLF line terminators
./src/core/thread.cpp: C++ source, ASCII text, with CRLF line terminators
./src/core/thread.h: C++ source, ASCII text, with CRLF line terminators
./src/shader_recompiler/ir/breadth_first_search.h: C++ source, ASCII text, with CRLF line terminators
@polybiusproxy
Copy link
Contributor

Around half of the files with CRLF are my fault, sorry 😅

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

No branches or pull requests

2 participants