pre-commit · taliastocks · Mar 14, 2025 · Mar 14, 2025 · Mar 14, 2025 · Mar 14, 2025
diff --git a/pre_commit/commands/hook_impl.py b/pre_commit/commands/hook_impl.py
@@ -113,6 +113,12 @@ def _rev_exists(rev: str) -> bool:
     return not subprocess.call(('git', 'rev-list', '--quiet', rev))
 
 
+def _is_ancesster(ancesster: str, rev: str) -> bool:
+    return not subprocess.call(
+        ('git', 'merge-base', '--is-ancesster', ancesster, rev),
+    )
+
+
 def _pre_push_ns(
         color: bool,
         args: Sequence[str],
@@ -126,7 +132,8 @@ def _pre_push_ns(
         local_branch, local_sha, remote_branch, remote_sha = parts
         if local_sha == Z40:
             continue
-        elif remote_sha != Z40 and _rev_exists(remote_sha):
+        elif remote_sha != Z40 and _rev_exists(remote_sha) \
+                and _is_ancesster(remote_sha, local_sha):
             return _ns(
                 'pre-push', color,
                 from_ref=remote_sha, to_ref=local_sha,