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

Merge pull request #571 from pre-commit/plumbing

Browse source 
Use more git plumbing commands in staged-files-only
This commit is contained in:
Anthony Sottile 2017-08-01 14:25:34 -04:00 • committed by GitHub
commit ce7481f75b
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pre_commit/staged_files_only.py
View file

@ -20,10 +20,11 @@ def staged_files_only(cmd_runner):
cmd_runner - PrefixedCommandRunner cmd_runner - PrefixedCommandRunner
""" """
# Determine if there are unstaged files # Determine if there are unstaged files
tree = cmd_runner.run(('git', 'write-tree'))[1].strip()
retcode, diff_stdout_binary, _ = cmd_runner.run( retcode, diff_stdout_binary, _ = cmd_runner.run(
( (
'git', 'diff', '--ignore-submodules', '--binary', '--exit-code', 'git', 'diff-index', '--ignore-submodules', '--binary',
'--no-color', '--no-ext-diff', '--exit-code', '--no-color', '--no-ext-diff', tree, '--',
), ),
retcode=None, retcode=None,
encoding=None, encoding=None,
@ -39,7 +40,7 @@ def staged_files_only(cmd_runner):
patch_file.write(diff_stdout_binary) patch_file.write(diff_stdout_binary)
# Clear the working directory of unstaged changes # Clear the working directory of unstaged changes
cmd_runner.run(['git', 'checkout', '--', '.']) cmd_runner.run(('git', 'checkout', '--', '.'))
try: try:
yield yield
finally: finally:
@ -57,7 +58,7 @@ def staged_files_only(cmd_runner):
# We failed to apply the patch, presumably due to fixes made # We failed to apply the patch, presumably due to fixes made
# by hooks. # by hooks.
# Roll back the changes made by hooks. # Roll back the changes made by hooks.
cmd_runner.run(['git', 'checkout', '--', '.']) cmd_runner.run(('git', 'checkout', '--', '.'))
cmd_runner.run( cmd_runner.run(
('git', 'apply', patch_filename, '--whitespace=nowarn'), ('git', 'apply', patch_filename, '--whitespace=nowarn'),
encoding=None, encoding=None,