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

fix: failing post-checkout on single file checkout

Browse source
This commit is contained in:
Vitalii Budnik 2024-12-23 17:30:15 +03:00
parent cb14bc2d9c
commit 54485588e5
No known key found for this signature in database
GPG key ID: AA40142F2E432041
2 changed files with 53 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pre_commit/commands/run.py
View file

@ -344,8 +344,20 @@ def run(
# Check if we have unresolved merge conflict files and fail fast.
if stash and _has_unmerged_paths():
logger.error('Unmerged files. Resolve before committing.')
return 1
# Do not fail on unmerged files if this is a post-checkout hooks.
# This handles cases when there are unmerged paths and:
# * resolving conflict with `git checkout --ours/--theirs -- <paths>`
# * or checking out single files with `git checkout <b> -- <paths>`.
if args.hook_stage == 'post-checkout':
output.write_line(
f'Skipping `{args.hook_stage}` hooks since '
f'it\'s a file checkout or same head ref',
)
return 0
else:
logger.error('Unmerged files. Resolve before committing.')
return 1
if bool(args.from_ref) != bool(args.to_ref):
logger.error('Specify both --from-ref and --to-ref.')
return 1