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

Run git diff with --no-ext-diff

Browse source
This commit is contained in:
Anthony Sottile 2017-06-09 08:34:04 -07:00
parent 844c839067
commit 321210d332
3 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
pre_commit/commands/run.py
View file

@ -32,7 +32,8 @@ def _hook_msg_start(hook, verbose):
def get_changed_files(new, old):
return cmd_output(
'git', 'diff', '--name-only', '{}...{}'.format(old, new),
'git', 'diff', '--no-ext-diff', '--name-only',
'{}...{}'.format(old, new),
)[1].splitlines()
@ -85,12 +86,16 @@ def _run_single_hook(hook, repo, args, skips, cols):
))
sys.stdout.flush()
diff_before = cmd_output('git', 'diff', retcode=None, encoding=None)
diff_before = cmd_output(
'git', 'diff', '--no-ext-diff', retcode=None, encoding=None,
)
retcode, stdout, stderr = repo.run_hook(
hook,
tuple(filenames) if hook['pass_filenames'] else (),
)
diff_after = cmd_output('git', 'diff', retcode=None, encoding=None)
diff_after = cmd_output(
'git', 'diff', '--no-ext-diff', retcode=None, encoding=None,
)
file_modifications = diff_before != diff_after
@ -159,10 +164,10 @@ def _run_hooks(repo_hooks, args, environ):
if (
retval and
args.show_diff_on_failure and
subprocess.call(('git', 'diff', '--quiet')) != 0
subprocess.call(('git', 'diff', '--quiet', '--no-ext-diff')) != 0
):
print('All changes made by hooks:')
subprocess.call(('git', 'diff'))
subprocess.call(('git', 'diff', '--no-ext-diff'))
return retval
@ -179,7 +184,10 @@ def _has_unmerged_paths(runner):
def _has_unstaged_config(runner):
retcode, _, _ = runner.cmd_runner.run(
('git', 'diff', '--exit-code', runner.config_file_path),
(
'git', 'diff', '--no-ext-diff', '--exit-code',
runner.config_file_path,
),
retcode=None,
)
# be explicit, other git errors don't mean it has an unstaged config.