diff options
| author | Steve Dower <steve.dower@python.org> | 2023-04-17 16:33:54 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-17 16:33:54 (GMT) |
| commit | eb5fd31948e2e379635e17545c18c9ef5d06d3e7 (patch) | |
| tree | 35355ab9b4c7098e1cd30affcc4ebc2258a25150 | |
| parent | 5d9762e7cf90444b03b43262be8001ff83401aac (diff) | |
| download | cpython-eb5fd31948e2e379635e17545c18c9ef5d06d3e7.zip cpython-eb5fd31948e2e379635e17545c18c9ef5d06d3e7.tar.gz cpython-eb5fd31948e2e379635e17545c18c9ef5d06d3e7.tar.bz2 | |
gh-103088: Ensure POSIX venv scripts always use LF line endings (GH-103591)
Also touches the affected files in meaningless ways to ensure they get updated when pulling
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | Lib/venv/scripts/common/activate | 2 | ||||
| -rw-r--r-- | Lib/venv/scripts/posix/activate.csh | 1 | ||||
| -rw-r--r-- | Lib/venv/scripts/posix/activate.fish | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes index cb1cf8b..4ed9506 100644 --- a/.gitattributes +++ b/.gitattributes @@ -34,6 +34,7 @@ Lib/test/xmltestdata/* noeol # Shell scripts should have LF even on Windows because of Cygwin Lib/venv/scripts/common/activate text eol=lf +Lib/venv/scripts/posix/* text eol=lf # CRLF files [attr]dos text eol=crlf diff --git a/Lib/venv/scripts/common/activate b/Lib/venv/scripts/common/activate index cb898b3..408df5c 100644 --- a/Lib/venv/scripts/common/activate +++ b/Lib/venv/scripts/common/activate @@ -1,5 +1,5 @@ # This file must be used with "source bin/activate" *from bash* -# you cannot run it directly +# You cannot run it directly deactivate () { # reset old environment variables diff --git a/Lib/venv/scripts/posix/activate.csh b/Lib/venv/scripts/posix/activate.csh index d6f697c..5e8d66f 100644 --- a/Lib/venv/scripts/posix/activate.csh +++ b/Lib/venv/scripts/posix/activate.csh @@ -1,5 +1,6 @@ # This file must be used with "source bin/activate.csh" *from csh*. # You cannot run it directly. + # Created by Davide Di Blasi <davidedb@gmail.com>. # Ported to Python 3.3 venv by Andrew Svetlov <andrew.svetlov@gmail.com> diff --git a/Lib/venv/scripts/posix/activate.fish b/Lib/venv/scripts/posix/activate.fish index 9aa4446..91ad644 100644 --- a/Lib/venv/scripts/posix/activate.fish +++ b/Lib/venv/scripts/posix/activate.fish @@ -1,5 +1,5 @@ # This file must be used with "source <venv>/bin/activate.fish" *from fish* -# (https://fishshell.com/); you cannot run it directly. +# (https://fishshell.com/). You cannot run it directly. function deactivate -d "Exit virtual environment and return to normal shell environment" # reset old environment variables |