mirror/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-02-05 15:59:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

Simplify has_unmerged_paths

Browse Source
This commit is contained in:
Anthony Sottile
2014-04-13 23:52:52 -07:00
parent 846ddeed67
commit 2e4cde9cb0
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pre_commit/commands.py
View File

@@ -30,9 +30,6 @@ COLS = int(subprocess.Popen(['tput', 'cols'], stdout=subprocess.PIPE).communicat
PASS_FAIL_LENGTH = 6
# Grabbed from `git help status`
CONFLICTING_GIT_STATUSES = set(('DD', 'AU', 'UD', 'UA', 'DU', 'AA', 'UU'))
def install(runner):
"""Install the pre-commit hooks."""
@@ -233,11 +230,8 @@ def _run_hook(runner, hook_id, args, write):
def _has_unmerged_paths(runner):
_, stdout, _ = runner.cmd_runner.run(
['git', 'status', '--short'], retcode=None,
)
codes = set(line[:2] for line in stdout.splitlines())
return codes & CONFLICTING_GIT_STATUSES > set()
_, stdout, _ = runner.cmd_runner.run(['git', 'ls-files', '--unmerged'])
return bool(stdout.strip())
def run(runner, args, write=sys.stdout.write):