FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix pre-push after rebase by taliastocks · Pull Request #3427 · pre-commit/pre-commit · GitHub

/ pre-commit Public

Fix pre-push after rebase #3427

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

Open
taliastocks wants to merge 5 commits into
base: main
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
Conversation 7 Commits 5 Checks 0 Files changed
Open

Fix pre-push after rebase #3427

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e7959ec
Update hook_impl.py
taliastocks Mar 14, 2025
6c87f31
Apply suggestions from code review
taliastocks Mar 14, 2025
311eeac
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 14, 2025
aadf716
Update pre_commit/commands/hook_impl.py
taliastocks Mar 14, 2025
132235c
Merge branch 'main' into patch-1
taliastocks Mar 17, 2025
File filter

Filter by extension

Filter by extension .py  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
9 changes: 8 additions & 1 deletion pre_commit/commands/hook_impl.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,12 @@ def _rev_exists(rev: str) -> bool:
return not subprocess.call(('git', 'rev-list', '--quiet', rev))


def _is_ancestor(ancestor: str, rev: str) -> bool:
return not subprocess.call(
('git', 'merge-base', '--is-ancestor', ancestor, rev),
)


def _pre_push_ns(
color: bool,
args: Sequence[str],
Expand All @@ -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_ancestor(remote_sha, local_sha):
return _ns(
'pre-push', color,
from_ref=remote_sha, to_ref=local_sha,
Expand Down
Back | FazBrowse Home | New Git URL