Skip to content

Do not use gitignore if explicitly passing excludes #2170

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

Merged
ambv merged 2 commits into from
May 7, 2021
Merged

Do not use gitignore if explicitly passing excludes #2170

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e101960
Do not use gitignore if explicitly passing excludes
ktbarrett Apr 30, 2021
989a915
nit: simplify comments, leave explicit 'show_default'
ambv May 7, 2021
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
nit: simplify comments, leave explicit 'show_default'
  • Loading branch information
@ambv
ambv committed May 7, 2021
commit 989a9153a653c4883aee82119c71e4a1684dad2d
4 changes: 2 additions & 2 deletions src/black/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,7 @@ def validate_regex(
" Exclusions are calculated first, inclusions later. [default:"
f" {DEFAULT_EXCLUDES}]"
),
show_default=False,
)
@click.option(
"--extend-exclude",
Expand Down Expand Up @@ -673,7 +674,6 @@ def get_sources(
sources: Set[Path] = set()
path_empty(src, "No Path provided. Nothing to do 😴", quiet, verbose, ctx)

# use default and gitignore exclusion rules if exclude option isn't specified
if exclude is None:
exclude = re_compile_maybe_verbose(DEFAULT_EXCLUDES)
gitignore = get_gitignore(root)
Expand Down Expand Up @@ -6241,7 +6241,7 @@ def gen_python_files(
if normalized_path is None:
continue

# Ignore files matching .gitignore only if 'exclude' is not passed
# First ignore files matching .gitignore, if passed
if gitignore is not None and gitignore.match_file(normalized_path):
report.path_ignored(child, "matches the .gitignore file content")
continue
Expand Down