Commit 27ee8c92 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Merge branch '1-skip-if-parent-not-in-history' into 'master' 

Ignore protect-first-parent rule if parent not in history at all

Closes #1

See merge request !3
parents 3e3d533c 18de0529

hooks/first_parent.py

+16 −0
Original line number Diff line number Diff line
@@ -74,10 +74,26 @@ def resolve_ref(ref: str) -> Optional[str]: 
	return proc.stdout.strip() or None





def is_ancestor(head_ref: str, other_ref: str) -> bool:

	"""

	Return True if "other_ref" is an ancestor of "head_ref"



	Note that "head_ref" refers to the head of a DAG graph to check, not a named reference

	in the refs/heads/ namespace.

	"""

	cmd = ["git", "merge-base", "--is-ancestor", other_ref, head_ref]

	return 0 == run(cmd).returncode





def check(ref: str, upstream: str) -> None:

	"""

	Exit with 1 if "upstream" can reach first-parent commits not reachable from "ref"



	Skipped if "upstream" is not an ancestor of "ref".  This would indicate rebasing which

	should be checked separately.

	"""

	if not is_ancestor(ref, upstream):

		return

	head_commits = get_fp_commits(ref)

	upstream_commits = get_fp_commits(upstream)

	if not upstream_commits.difference(head_commits):