third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-04-15 18:11:48 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "Change cmd_output_bs retcode arg to a boolean check"

Browse source
This commit is contained in:
Martin Gustafsson 2022-10-30 23:29:13 +01:00 • committed by GitHub
parent 0827de1864
commit 19710cd956
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 37 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/conftest.py
View file

@ -68,7 +68,7 @@ def _make_conflict():
bar_only_file.write('bar')
cmd_output('git', 'add', 'bar_only_file')
git_commit(msg=_make_conflict.__name__)
cmd_output('git', 'merge', 'foo', check=False)
cmd_output('git', 'merge', 'foo', retcode=None)
@pytest.fixture