summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Crosley <timothy.crosley@gmail.com>2021-07-28 23:36:06 -0700
committerTimothy Crosley <timothy.crosley@gmail.com>2021-07-28 23:36:06 -0700
commit185b14e07842fef6d37e037eb07122ae6af3a638 (patch)
tree8d4371a96f8ead77c33a3b4c064bbf1d731acc16
parent915aa6814cc7eef2305b336f4457c667e8f9fc38 (diff)
downloadisort-issue/1792-fix-literal-sort-at-top.tar.gz
Fixed #1777: extend_skip is not honored wit a git submodule when skip_gitignore=true.issue/1792-fix-literal-sort-at-top
-rw-r--r--CHANGELOG.md1
-rw-r--r--isort/settings.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f271a3c9..0b863103 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ Find out more about isort's release policy [here](https://pycqa.github.io/isort/
- Fixed #1779: Pylama integration ignores pylama specific isort config overrides.
- Fixed #1781: `--from-first` CLI flag shouldn't take any arguments.
- Fixed #1792: Sorting literals sometimes ignored when placed on first few lines of file.
+ - Fixed #1777: extend_skip is not honored wit a git submodule when skip_gitignore=true.
### 5.9.2 July 8th 2021
- Improved behavior of `isort --check --atomic` against Cython files.
diff --git a/isort/settings.py b/isort/settings.py
index ee729744..1acdb50d 100644
--- a/isort/settings.py
+++ b/isort/settings.py
@@ -559,7 +559,7 @@ class Config(_Config):
git_options = ["-C", str(git_folder), "-c", "core.quotePath="]
try:
ignored = subprocess.check_output( # nosec # skipcq: PYL-W1510
- ["git", *git_options, "check-ignore", "-z", "--stdin"],
+ ["git", *git_options, "check-ignore", "-z", "--stdin", "--no-index"],
encoding="utf-8",
env=env,
input="\0".join(files),