pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2025-08-14 01:00:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adjust git dir when checking for merge in worktree

Browse Source
This commit is contained in:
Ersin Yildirim
2021-10-04 21:50:38 +02:00
committed by Anthony Sottile
parent e35ba8d463
commit 07af54024c
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pre_commit_hooks/check_merge_conflict.py
View File

@ -3,6 +3,8 @@ import os.path
from typing import Optional
from typing import Sequence
from pre_commit_hooks.util import cmd_output
CONFLICT_PATTERNS = [
b'<<<<<<< ',
@ -12,13 +14,14 @@ CONFLICT_PATTERNS = [
]
def is_in_merge() -> int:
def is_in_merge() -> bool:
git_dir = cmd_output('git', 'rev-parse', '--git-dir').rstrip()
return (
os.path.exists(os.path.join('.git', 'MERGE_MSG')) and
os.path.exists(os.path.join(git_dir, 'MERGE_MSG')) and
(
os.path.exists(os.path.join('.git', 'MERGE_HEAD')) or
os.path.exists(os.path.join('.git', 'rebase-apply')) or
os.path.exists(os.path.join('.git', 'rebase-merge'))
os.path.exists(os.path.join(git_dir, 'MERGE_HEAD')) or
os.path.exists(os.path.join(git_dir, 'rebase-apply')) or
os.path.exists(os.path.join(git_dir, 'rebase-merge'))
)
)