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

Switch back to diff instead of diff-index

Browse source 
`diff-index` appears to act strangely with `git add --intent-to-add`
This commit is contained in:
Anthony Sottile 2018-12-13 10:08:57 -08:00
parent 51659ee606
commit aae31993cd
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pre_commit/staged_files_only.py
View file

@ -29,10 +29,9 @@ def staged_files_only(patch_dir):
context. context.
""" """
# Determine if there are unstaged files # Determine if there are unstaged files
tree = cmd_output('git', 'write-tree')[1].strip()
retcode, diff_stdout_binary, _ = cmd_output( retcode, diff_stdout_binary, _ = cmd_output(
'git', 'diff-index', '--ignore-submodules', '--binary', 'git', 'diff', '--ignore-submodules', '--binary',
'--exit-code', '--no-color', '--no-ext-diff', tree, '--', '--exit-code', '--no-color', '--no-ext-diff', '--',
retcode=None, retcode=None,
encoding=None, encoding=None,
) )

11
tests/staged_files_only_test.py
View file

@ -350,3 +350,14 @@ def test_autocrlf_commited_crlf(in_git_dir, patch_dir):
with staged_files_only(patch_dir): with staged_files_only(patch_dir):
assert_no_diff() assert_no_diff()
def test_intent_to_add(in_git_dir, patch_dir):
"""Regression test for #881"""
_write(b'hello\nworld\n')
cmd_output('git', 'add', '--intent-to-add', 'foo')
with staged_files_only(patch_dir):
# there's another bug with `diff-index` with `--intent-to-add`
# TODO: use `assert_no_diff()`
cmd_output('git', 'diff', '--exit-code', '--')