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

Workaround git apply with autocrlf=true bug

Browse source
This commit is contained in:
Anthony Sottile 2017-08-01 11:45:51 -07:00
parent ce7481f75b
commit 0548b0b521
2 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
pre_commit/staged_files_only.py
View file

@ -11,6 +11,16 @@ from pre_commit.util import CalledProcessError
logger = logging.getLogger('pre_commit')
def _git_apply(cmd_runner, patch):
args = ('apply', '--whitespace=nowarn', patch)
try:
cmd_runner.run(('git',) + args, encoding=None)
except CalledProcessError:
# Retry with autocrlf=false -- see #570
cmd = ('git', '-c', 'core.autocrlf=false') + args
cmd_runner.run(cmd, encoding=None)
@contextlib.contextmanager
def staged_files_only(cmd_runner):
"""Clear any unstaged changes from the git working directory inside this
@ -46,10 +56,7 @@ def staged_files_only(cmd_runner):
finally:
# Try to apply the patch we saved
try:
cmd_runner.run(
('git', 'apply', '--whitespace=nowarn', patch_filename),
encoding=None,
)
_git_apply(cmd_runner, patch_filename)
except CalledProcessError:
logger.warning(
'Stashed changes conflicted with hook auto-fixes... '
@ -59,10 +66,7 @@ def staged_files_only(cmd_runner):
# by hooks.
# Roll back the changes made by hooks.
cmd_runner.run(('git', 'checkout', '--', '.'))
cmd_runner.run(
('git', 'apply', patch_filename, '--whitespace=nowarn'),
encoding=None,
)
_git_apply(cmd_runner, patch_filename)
logger.info('Restored changes from {}.'.format(patch_filename))
else:
# There weren't any staged files so we don't need to do anything