Skip to content

fix(pre-push): treat SHA-256 all-zero OIDs as null object #3724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Solaris-star wants to merge 1 commit into from
+30 −2
Closed

fix(pre-push): treat SHA-256 all-zero OIDs as null object #3724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions pre_commit/commands/hook_impl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@
from pre_commit.store import Store

Z40 = '0' * 40
# Git may emit a 40-char (SHA-1) or 64-char (SHA-256) all-zero OID for
# "no object" on pre-push stdin (new branch / deletion). Treat either as zero.
Z64 = '0' * 64


def _is_zero_oid(sha: str) -> bool:
"""Return True for the all-zero OID of any supported hash length."""
return bool(sha) and set(sha) <= {'0'}


def _run_legacy(
Expand Down Expand Up @@ -128,9 +136,9 @@ def _pre_push_ns(
for line in stdin.decode().splitlines():
parts = line.rsplit(maxsplit=3)
local_branch, local_sha, remote_branch, remote_sha = parts
if local_sha == Z40:
if _is_zero_oid(local_sha):
continue
elif remote_sha != Z40 and _rev_exists(remote_sha):
elif not _is_zero_oid(remote_sha) and _rev_exists(remote_sha):
return _ns(
'pre-push', color,
from_ref=remote_sha, to_ref=local_sha,
Expand Down
20 changes: 20 additions & 0 deletions tests/commands/hook_impl_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,26 @@ def test_run_ns_pre_push_deleting_branch(push_example):
assert ns is None


def test_run_ns_pre_push_deleting_branch_sha256_zero_oid(push_example):
"""SHA-256 repos emit 64-char zero OIDs; deletion must still no-op (#3664)."""
src, src_head, clone, _ = push_example
z64 = '0' * 64

with cwd(clone):
args = ('origin', src)
stdin = f'(delete) {z64} refs/heads/b {src_head}'.encode()
ns = hook_impl._run_ns('pre-push', False, args, stdin)

assert ns is None


def test_is_zero_oid():
assert hook_impl._is_zero_oid(hook_impl.Z40)
assert hook_impl._is_zero_oid(hook_impl.Z64)
assert not hook_impl._is_zero_oid('a' * 40)
assert not hook_impl._is_zero_oid('')


def test_hook_impl_main_noop_pre_push(cap_out, store, push_example):
src, src_head, clone, _ = push_example

Expand Down
Loading