third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-02-17 08:14:42 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove --no-stash and --allow-unstaged-config

Browse source
This commit is contained in:
Anthony Sottile 2017-08-23 10:24:02 -07:00
parent 7139a47c1c
commit 6793fd8e5d
4 changed files with 12 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/git_test.py
View file

@ -137,8 +137,7 @@ def test_get_conflicted_files_in_submodule(in_conflicting_submodule):
def test_get_conflicted_files_unstaged_files(in_merge_conflict):
# If they for whatever reason did pre-commit run --no-stash during a
# conflict
"""This case no longer occurs, but it is a useful test nonetheless"""
resolve_conflict()
# Make unstaged file.