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.

Sign up for GitHub

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

Jump to bottom

Solved Problem with Non-ASCII .gitignore Files #2229

Merged
merged 12 commits into from May 24, 2021
Merged

Solved Problem with Non-ASCII .gitignore Files #2229

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b0100b5
Solved Problem with non-alphabetical .gitignore files
temeddix May 13, 2021
6c3a7ea
Made .gitignore File Reader Detect Its Encoding
temeddix May 13, 2021
fa3c5de
Revert "Made .gitignore File Reader Detect Its Encoding"
temeddix May 14, 2021
8c21ba8
Revert "Solved Problem with non-alphabetical .gitignore files"
temeddix May 14, 2021
50dd804
Made .gitignore Reader Open the File with Auto Encoding Detecting
temeddix May 14, 2021
b848bce
Revert "Made .gitignore Reader Open the File with Auto Encoding Detec…
temeddix May 14, 2021
9cde20a
Made .gitignore Reader Use UTF-8
temeddix May 14, 2021
ae88e22
Updated CHANGES.md for #2229
temeddix May 14, 2021
423f1cc
Updated CHANGES.md for #2229
temeddix May 14, 2021
8c92b3d
Update CHANGES.md
ambv May 16, 2021
26b6b20
Merge branch 'main' into main
temeddix May 16, 2021
f637812
Update CHANGES.md
temeddix May 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.md
View file
Open in desktop
Expand Up @@ -4,6 +4,8 @@

### _Black_

- Fix handling of .gitignore files containing non-ASCII characters on Windows (#2229)
- Fix typos discovered by codespell (#2228)
temeddix marked this conversation as resolved.
Show resolved Hide resolved
- Respect `.gitignore` files in all levels, not only `root/.gitignore` file (apply
`.gitignore` rules like `git` does) (#2225)
- Restored compatibility with Click 8.0 on Python 3.6 when LANG=C used (#2227)
Expand Down
2 changes: 1 addition & 1 deletion src/black/files.py
View file
Open in desktop
Expand Up @@ -118,7 +118,7 @@ def get_gitignore(root: Path) -> PathSpec:
gitignore = root / ".gitignore"
lines: List[str] = []
if gitignore.is_file():
with gitignore.open() as gf:
with gitignore.open(encoding="utf-8") as gf:
lines = gf.readlines()
return PathSpec.from_lines("gitwildmatch", lines)

Expand Down