git.madduck.net Git - etc/vim.git/commit

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

author	Hadi Alqattan <alqattanhadizaki@gmail.com>
	Sun, 16 May 2021 17:51:27 +0000 (20:51 +0300)
committer	GitHub <noreply@github.com>
	Sun, 16 May 2021 17:51:27 +0000 (13:51 -0400)
commit	b8450b9faee10f3a0a63378b58adde60a27964e0
tree	804c6dd0176fffdd8f14c6a953da808ffea168a0	tree \| snapshot
parent	60f8bd2c89fbb370e6816fd6d6e5eca64d5b9f13	commit \| diff

Fix: black only respects the root gitignore. (#2225)

Commit history before merge:

Black now respects .gitignore files in all levels, not only root/.gitignore file
(apply .gitignore rules like git does).

* Fix: typo
* Fix: respect .gitignore files in all levels.
* Add: CHANGELOG note.
* Fix: TypeError: unsupported operand type(s) for +: 'NoneType' and 'PathSpec'
* Update docs.
* Fix: no parent .gitignore
* Add a comment since the if expression is a bit hard to understand
* Update tests - conver no parent .gitignore case.
* Use main's Pipfile.lock instead

  The original changes in Pipfile.lock are whitespace only. The changes
  turned the JSON's file indentation from 4 to 2. Effectively this
  happened: `json.dumps(json.loads(old_pipfile_lock), indent=2) + "\n"`.

  Just using main's Pipfile.lock instead of undoing the changes because
  1) I don't know how to do that easily and quickly, and 2) there's a
  merge conflict.

Co-authored-by: Richard Si <63936253+ichard26@users.noreply.github.com>
* Merge remote-tracking branch 'upstream/main' into i1730 …

  conflicts for days ay?

CHANGES.md		diff \| blob \| history
docs/usage_and_configuration/file_collection_and_discovery.md		diff \| blob \| history
src/black/files.py		diff \| blob \| history
tests/data/nested_gitignore_tests/pyproject.toml	[new file with mode: 0644]	blob
tests/data/nested_gitignore_tests/root/.gitignore	[new file with mode: 0644]	blob
tests/data/nested_gitignore_tests/root/a.py	[new file with mode: 0644]	blob
tests/data/nested_gitignore_tests/root/b.py	[new file with mode: 0644]	blob
tests/data/nested_gitignore_tests/root/c.py	[new file with mode: 0644]	blob
tests/data/nested_gitignore_tests/root/child/.gitignore	[new file with mode: 0644]	blob
tests/data/nested_gitignore_tests/root/child/a.py	[new file with mode: 0644]	blob
tests/data/nested_gitignore_tests/root/child/b.py	[new file with mode: 0644]	blob
tests/data/nested_gitignore_tests/root/child/c.py	[new file with mode: 0644]	blob
tests/data/nested_gitignore_tests/x.py	[new file with mode: 0644]	blob
tests/test_black.py		diff \| blob \| history

madduck's git repository

Legalese