From 5e602c553ffc688d7c5b1aad564512e27970faf1 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sun, 1 Nov 2020 15:24:25 +1000 Subject: [PATCH] enforce eol normalization in gitattributes --- .gitattributes | 3 +-- .github/workflows/checks.yml | 3 --- docs/development.md | 13 ------------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/.gitattributes b/.gitattributes index efde40a76..6313b56c5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1 @@ -*.ftl eol=lf -*.sh eol=lf +* text=auto eol=lf diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index eecb210cd..be8b845fd 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -111,9 +111,6 @@ jobs: fail-fast: false steps: - - run: git config --global core.autocrlf false - if: matrix.os == 'windows-latest' - - uses: actions/checkout@v2 - name: Configure Linux environment variables diff --git a/docs/development.md b/docs/development.md index 026ca9c07..181afc673 100644 --- a/docs/development.md +++ b/docs/development.md @@ -184,11 +184,6 @@ recommended to follow these instructions step-by-step. - install Git and Git Bash (this delivers curl too) - add git/usr/bin to your System PATH before cygwin/bin folder, mentioned above. - - run: - - git config --global core.autocrlf - - make a note of the result (referred to as [yourLineEndingsValue] later in these notes) - - if the [yourLineEndingsValue] is not 'input', run (to preserve Anki's Unix line endings): - - git config --global core.autocrlf input - run: - cargo install ripgrep @@ -228,14 +223,6 @@ recommended to follow these instructions step-by-step. - open PyCharm Terminal (Git Bash) -- set your local Anki project to preserve unix line endings: - - git config --local core.autocrlf input -- if [yourLineEndingsValue] was not 'input', revert global line endings: - - - git config --global core.autocrlf [yourLineEndingsValue] - - e.g. (most likely): - - git config --global core.autocrlf true - - ensure your virtual environment is set up as you like it to be - if you don't set the virtual environment to pyenv (Anki's virtual environment folder) don't forget to add the