From: Hadi Alqattan <alqattanhadizaki@gmail.com>
Date: Sun, 16 May 2021 17:51:27 +0000 (+0300)
Subject: Fix: black only respects the root gitignore. (#2225)
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/b8450b9faee10f3a0a63378b58adde60a27964e0?ds=sidebyside;hp=b8450b9faee10f3a0a63378b58adde60a27964e0

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?
---