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

Normalize repo to LF (Unix) line-endings, enforce #654

Merged
merged 1 commit into from Apr 13, 2021

Conversation

ferdnyc
Copy link
Contributor

@ferdnyc ferdnyc commented Apr 12, 2021

This PR normalizes the line-ending format for all files in the repo, and preserves this going forward by configuring git to manage EOL format for all files automatically (converting where appropriate).

  • A top-level .gitattributes file sets the attribute text=auto for all files in the repo, enabling line-ending normalization
  • A subsequent git add --renormalize run converted any existing CRLF files to the canonical LF format.

Automatic behind-the-scenes conversion, for Windows users

  • For convenience, Git tools running under Windows will convert files to CRLF automatically on checkout, when text=auto is set. Any commits added will be converted back to the repo format for checkin. This keeps the repo's files consistent without forcing any disruptive changes on Windows users.

- A top-level .gitattributes sets the attribute 'text=auto' for all
  files in the repo, enabling line-ending normalization
- A `git add --renormalize` run converted any existing CRLF files
  to the canonical LF format.
- 'text=auto' permits Git on Windows to convert files to CRLF
  automatically on checkout, for convenience. Any commits
  added will be converted back to the repo format for checkin.
@ferdnyc ferdnyc added the code Source code cleanup, streamlining, or style tweaks label Apr 12, 2021
@codecov
Copy link

codecov bot commented Apr 12, 2021

Codecov Report

Merging #654 (0d57be6) into develop (8cefd49) will not change coverage.
The diff coverage is 62.01%.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop     #654   +/-   ##
========================================
  Coverage    52.42%   52.42%           
========================================
  Files          151      151           
  Lines        12346    12346           
========================================
  Hits          6473     6473           
  Misses        5873     5873           
Impacted Files Coverage Δ
src/sort_filter/Hungarian.cpp 43.88% <43.88%> (ø)
src/sort_filter/sort.cpp 74.77% <74.77%> (ø)
src/sort_filter/KalmanTracker.cpp 87.50% <87.50%> (ø)
src/sort_filter/KalmanTracker.h 100.00% <100.00%> (ø)
src/sort_filter/sort.hpp 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8cefd49...0d57be6. Read the comment docs.

@ferdnyc ferdnyc merged commit fbc8a9b into OpenShot:develop Apr 13, 2021
@ferdnyc ferdnyc deleted the eol-normalization branch April 13, 2021 12:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
code Source code cleanup, streamlining, or style tweaks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant