third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-04-15 10:01:46 +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/git_test.py
View file

@ -104,7 +104,7 @@ def test_is_in_merge_conflict_submodule(in_conflicting_submodule):
def test_cherry_pick_conflict(in_merge_conflict):
cmd_output('git', 'merge', '--abort')
foo_ref = cmd_output('git', 'rev-parse', 'foo')[1].strip()
cmd_output('git', 'cherry-pick', foo_ref, check=False)
cmd_output('git', 'cherry-pick', foo_ref, retcode=None)
assert git.is_in_merge_conflict() is False