mirror/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-01-14 04:50:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

fall back to full diff on disparate histories

Browse Source
This commit is contained in:
Anthony Sottile
2021-08-09 20:13:15 -04:00
parent abc1c5d9ba
commit 0fe959df60
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pre_commit/git.py
View File

@@ -155,12 +155,15 @@ def get_all_files() -> List[str]:
def get_changed_files(old: str, new: str) -> List[str]:
return zsplit(
cmd_output(
'git', 'diff', '--name-only', '--no-ext-diff', '-z',
f'{old}...{new}',
)[1],
)
diff_cmd = ('git', 'diff', '--name-only', '--no-ext-diff', '-z')
try:
_, out, _ = cmd_output(*diff_cmd, f'{old}...{new}')
except CalledProcessError: # pragma: no cover (new git)
# on newer git where old and new do not have a merge base git fails
# so we try a full diff (this is what old git did for us!)
_, out, _ = cmd_output(*diff_cmd, f'{old}..{new}')
return zsplit(out)
def head_rev(remote: str) -> str: