Fix pre-push range after rebase by j178 · Pull Request #2089 · j178/prek

j178 · 2026-05-17T07:58:54Z

Closes #2088

codecov · 2026-05-17T08:00:51Z

Codecov Report

❌ Patch coverage is 76.59574% with 11 lines in your changes missing coverage. Please review.
✅ Project coverage is 92.46%. Comparing base (787bda0) to head (bd883c1).

Files with missing lines	Patch %	Lines
crates/prek/src/cli/hook_impl.rs	75.00%	7 Missing ⚠️
crates/prek/src/git.rs	78.94%	4 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #2089      +/-   ##
==========================================
+ Coverage   92.34%   92.46%   +0.11%     
==========================================
  Files         119      119              
  Lines       24413    24435      +22     
==========================================
+ Hits        22545    22593      +48     
+ Misses       1868     1842      -26

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copilot

Pull request overview

Fixes incorrect pre-push diff scoping after a rebase + force-push by detecting when the remote tip is no longer an ancestor of the local tip and falling back to “new branch” base selection (PR-like diff), preventing default-branch churn from being included.

Changes:

Add git::is_ancestor() helper (via git merge-base --is-ancestor) to detect rebased force-push ancestry breaks.
Update pre-push stdin parsing to use the remote tip only when it’s an ancestor; otherwise derive a base from “commits not in remote” to avoid oversized diffs.
Add an integration regression test reproducing #2088 and asserting only feature-branch files are checked after rebase + git push --force.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File	Description
crates/prek/tests/hook_impl.rs	Adds a regression test covering rebased force-push pre-push file selection.
crates/prek/src/git.rs	Introduces `is_ancestor()` to support correct pre-push range selection.
crates/prek/src/cli/hook_impl.rs	Adjusts pre-push range calculation to avoid three-dot diffs against non-ancestor remote tips.

prek-ci-bot · 2026-05-17T08:11:09Z

📦 Cargo Bloat Comparison

Binary size change: +0.00% (26.1 MiB → 26.1 MiB)

Expand for cargo-bloat output

Head Branch Results

 File  .text     Size             Crate Name
 1.2%   2.6% 332.0KiB        aws_lc_sys aws_lc_0_39_1_aes_gcm_encrypt_avx512
 1.2%   2.6% 332.0KiB        aws_lc_sys aws_lc_0_39_1_aes_gcm_decrypt_avx512
 0.3%   0.7%  92.0KiB              prek prek::languages::<impl prek::config::Language>::run::{{closure}}::{{closure}}
 0.3%   0.7%  84.6KiB              prek prek::languages::<impl prek::config::Language>::run::{{closure}}::{{closure}}
 0.2%   0.5%  65.5KiB              prek prek::languages::<impl prek::config::Language>::install::{{closure}}
 0.2%   0.5%  60.9KiB             prek? <prek::cli::Command as clap_builder::derive::Subcommand>::augment_subcommands
 0.2%   0.4%  53.3KiB annotate_snippets annotate_snippets::renderer::render::render
 0.2%   0.4%  48.6KiB              prek prek::run::{{closure}}
 0.2%   0.3%  43.8KiB              prek prek::cli::run::run::run::{{closure}}
 0.1%   0.3%  33.3KiB             prek? <prek::cli::RunArgs as clap_builder::derive::Args>::augment_args
 0.1%   0.2%  32.1KiB             prek? <prek::config::_::<impl serde_core::de::Deserialize for prek::config::Config>::deserialize::__Visitor as serde_core::de::Visitor>::visit_map
 0.1%   0.2%  28.7KiB               std core::ptr::drop_in_place<prek::languages::<impl prek::config::Language>::install::{{closure}}>
 0.1%   0.2%  28.0KiB        aws_lc_sys aws_lc_0_39_1_edwards25519_scalarmuldouble_alt
 0.1%   0.2%  27.6KiB      serde_saphyr saphyr_parser_bw::scanner::Scanner<T>::fetch_more_tokens
 0.1%   0.2%  27.5KiB        aws_lc_sys aws_lc_0_39_1_edwards25519_scalarmuldouble
 0.1%   0.2%  26.5KiB              prek prek::cli::try_repo::try_repo::{{closure}}
 0.1%   0.2%  23.9KiB              prek prek::hooks::meta_hooks::MetaHooks::run::{{closure}}
 0.1%   0.2%  22.5KiB      serde_saphyr saphyr_parser_bw::scanner::Scanner<T>::fetch_more_tokens
 0.1%   0.2%  22.3KiB         [Unknown] Lp384_montjscalarmul_alt_p384_montjadd
 0.1%   0.2%  21.5KiB      clap_builder clap_builder::parser::parser::Parser::get_matches_with
41.6%  86.3%  10.9MiB                   And 23840 smaller methods. Use -n N to show more.
48.2% 100.0%  12.6MiB                   .text section size, the file size is 26.1MiB

Base Branch Results

 File  .text     Size             Crate Name
 1.2%   2.6% 332.0KiB        aws_lc_sys aws_lc_0_39_1_aes_gcm_encrypt_avx512
 1.2%   2.6% 332.0KiB        aws_lc_sys aws_lc_0_39_1_aes_gcm_decrypt_avx512
 0.3%   0.7%  91.7KiB              prek prek::languages::<impl prek::config::Language>::run::{{closure}}::{{closure}}
 0.3%   0.7%  84.6KiB              prek prek::languages::<impl prek::config::Language>::run::{{closure}}::{{closure}}
 0.2%   0.5%  65.5KiB              prek prek::languages::<impl prek::config::Language>::install::{{closure}}
 0.2%   0.5%  60.9KiB             prek? <prek::cli::Command as clap_builder::derive::Subcommand>::augment_subcommands
 0.2%   0.4%  53.3KiB annotate_snippets annotate_snippets::renderer::render::render
 0.2%   0.4%  48.6KiB              prek prek::run::{{closure}}
 0.2%   0.3%  43.8KiB              prek prek::cli::run::run::run::{{closure}}
 0.1%   0.3%  33.3KiB             prek? <prek::cli::RunArgs as clap_builder::derive::Args>::augment_args
 0.1%   0.2%  32.1KiB             prek? <prek::config::_::<impl serde_core::de::Deserialize for prek::config::Config>::deserialize::__Visitor as serde_core::de::Visitor>::visit_map
 0.1%   0.2%  28.7KiB               std core::ptr::drop_in_place<prek::languages::<impl prek::config::Language>::install::{{closure}}>
 0.1%   0.2%  28.0KiB        aws_lc_sys aws_lc_0_39_1_edwards25519_scalarmuldouble_alt
 0.1%   0.2%  27.6KiB      serde_saphyr saphyr_parser_bw::scanner::Scanner<T>::fetch_more_tokens
 0.1%   0.2%  27.5KiB        aws_lc_sys aws_lc_0_39_1_edwards25519_scalarmuldouble
 0.1%   0.2%  26.5KiB              prek prek::cli::try_repo::try_repo::{{closure}}
 0.1%   0.2%  24.4KiB              prek prek::hooks::meta_hooks::MetaHooks::run::{{closure}}
 0.1%   0.2%  22.5KiB      serde_saphyr saphyr_parser_bw::scanner::Scanner<T>::fetch_more_tokens
 0.1%   0.2%  22.3KiB         [Unknown] Lp384_montjscalarmul_alt_p384_montjadd
 0.1%   0.2%  21.5KiB      clap_builder clap_builder::parser::parser::Parser::get_matches_with
41.6%  86.3%  10.9MiB                   And 23834 smaller methods. Use -n N to show more.
48.2% 100.0%  12.6MiB                   .text section size, the file size is 26.1MiB

prek-ci-bot · 2026-05-17T08:11:10Z

⚡️ Hyperfine Benchmarks

Summary: 1 regressions, 0 improvements above the 10% threshold.

Environment

OS: Linux 6.17.0-1013-azure
CPU: 4 cores
prek version: prek 0.4.0+7 (c79f157 2026-05-17)
Rust version: rustc 1.95.0 (59807616e 2026-04-14)
Hyperfine version: hyperfine 1.20.0

CLI Commands

Benchmarking basic commands in the main repo:

`prek --version`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base --version`	2.4 ± 0.1	2.2	2.6	1.01 ± 0.04
`prek-head --version`	2.4 ± 0.1	2.2	2.5	1.00

`prek list`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base list`	9.1 ± 0.1	8.9	9.4	1.00 ± 0.02
`prek-head list`	9.1 ± 0.1	8.9	9.9	1.00

`prek validate-config .pre-commit-config.yaml`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base validate-config .pre-commit-config.yaml`	3.2 ± 0.1	3.1	3.3	1.00
`prek-head validate-config .pre-commit-config.yaml`	3.2 ± 0.1	3.1	3.4	1.00 ± 0.03

`prek sample-config`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base sample-config`	2.7 ± 0.0	2.5	2.7	1.00
`prek-head sample-config`	2.7 ± 0.0	2.6	2.8	1.00 ± 0.03

Cold vs Warm Runs

Comparing first run (cold) vs subsequent runs (warm cache):

`prek run --all-files (cold - no cache)`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base run --all-files`	143.1 ± 2.0	141.0	148.1	1.00
`prek-head run --all-files`	145.5 ± 8.4	140.8	168.7	1.02 ± 0.06

`prek run --all-files (warm - with cache)`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base run --all-files`	143.0 ± 2.6	139.1	148.8	1.00
`prek-head run --all-files`	144.4 ± 2.4	140.8	151.0	1.01 ± 0.02

Full Hook Suite

Running the builtin hook suite on the benchmark workspace:

`prek run --all-files (full builtin hook suite)`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base run --all-files`	145.9 ± 3.6	141.7	164.2	1.00 ± 0.04
`prek-head run --all-files`	145.5 ± 4.1	140.8	164.0	1.00

Individual Hook Performance

Benchmarking each hook individually on the test repo:

`prek run trailing-whitespace --all-files`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base run trailing-whitespace --all-files`	21.3 ± 0.9	20.4	25.0	1.00
`prek-head run trailing-whitespace --all-files`	25.7 ± 27.3	20.1	170.1	1.21 ± 1.28

⚠️ Warning: Performance regression for prek run trailing-whitespace --all-files: 20.6000% slower

`prek run end-of-file-fixer --all-files`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base run end-of-file-fixer --all-files`	27.4 ± 2.3	24.0	31.5	1.02 ± 0.12
`prek-head run end-of-file-fixer --all-files`	26.8 ± 2.3	24.4	30.7	1.00

`prek run check-json --all-files`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base run check-json --all-files`	12.5 ± 0.5	11.5	13.3	1.05 ± 0.05
`prek-head run check-json --all-files`	11.9 ± 0.2	11.5	12.3	1.00

`prek run check-yaml --all-files`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base run check-yaml --all-files`	11.7 ± 0.3	11.4	12.4	1.01 ± 0.02
`prek-head run check-yaml --all-files`	11.6 ± 0.1	11.4	11.8	1.00

`prek run check-toml --all-files`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base run check-toml --all-files`	11.9 ± 0.2	11.6	12.6	1.00 ± 0.03
`prek-head run check-toml --all-files`	11.9 ± 0.2	11.5	12.4	1.00

`prek run check-xml --all-files`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base run check-xml --all-files`	11.9 ± 0.2	11.5	12.4	1.01 ± 0.03
`prek-head run check-xml --all-files`	11.8 ± 0.3	11.5	12.6	1.00

`prek run detect-private-key --all-files`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base run detect-private-key --all-files`	17.7 ± 1.3	15.9	20.8	1.01 ± 0.10
`prek-head run detect-private-key --all-files`	17.5 ± 1.2	16.1	21.7	1.00

`prek run fix-byte-order-marker --all-files`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base run fix-byte-order-marker --all-files`	21.9 ± 1.4	19.8	24.5	1.00
`prek-head run fix-byte-order-marker --all-files`	22.7 ± 1.7	20.0	25.2	1.04 ± 0.10

Installation Performance

Benchmarking hook installation (fast path hooks skip Python setup):

`prek install-hooks (cold - no cache)`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base install-hooks`	4.8 ± 0.1	4.7	5.0	1.02 ± 0.03
`prek-head install-hooks`	4.7 ± 0.0	4.7	4.8	1.00

`prek install-hooks (warm - with cache)`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base install-hooks`	4.8 ± 0.1	4.6	4.9	1.00 ± 0.02
`prek-head install-hooks`	4.7 ± 0.0	4.7	4.8	1.00

File Filtering/Scoping Performance

Testing different file selection modes:

`prek run (staged files only)`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base run`	50.7 ± 0.9	49.2	52.7	1.00
`prek-head run`	51.0 ± 0.9	49.7	53.3	1.01 ± 0.03

`prek run --files '*.json' (specific file type)`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base run --files '*.json'`	8.6 ± 0.1	8.5	8.8	1.00 ± 0.02
`prek-head run --files '*.json'`	8.6 ± 0.1	8.4	9.0	1.00

Workspace Discovery & Initialization

Benchmarking hook discovery and initialization overhead:

`prek run --dry-run --all-files (measures init overhead)`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base run --dry-run --all-files`	10.8 ± 0.1	10.7	11.0	1.00
`prek-head run --dry-run --all-files`	10.9 ± 0.1	10.7	11.1	1.00 ± 0.01

Meta Hooks Performance

Benchmarking meta hooks separately:

`prek run check-hooks-apply --all-files`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base run check-hooks-apply --all-files`	13.4 ± 0.2	13.1	14.0	1.04 ± 0.06
`prek-head run check-hooks-apply --all-files`	12.8 ± 0.7	11.8	13.5	1.00

`prek run check-useless-excludes --all-files`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base run check-useless-excludes --all-files`	11.8 ± 0.1	11.6	12.1	1.00
`prek-head run check-useless-excludes --all-files`	11.9 ± 0.1	11.7	12.1	1.01 ± 0.02

`prek run identity --all-files`

Command	Mean [ms]	Min [ms]	Max [ms]	Relative
`prek-base run identity --all-files`	10.7 ± 0.1	10.6	10.9	1.00
`prek-head run identity --all-files`	10.8 ± 0.1	10.7	11.1	1.01 ± 0.01

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [prek](https://github.com/j178/prek) | patch | `0.4.0` → `0.4.1` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>j178/prek (prek)</summary> ### [`v0.4.1`](https://github.com/j178/prek/blob/HEAD/CHANGELOG.md#041) [Compare Source](j178/prek@v0.4.0...v0.4.1) Released on 2026-05-20. ##### Enhancements - Fix pre-push range after rebase ([#2089](j178/prek#2089)) - Prefer extensions over loose filename tags ([#2092](j178/prek#2092)) - Skip installs for hooks that will not run ([#2103](j178/prek#2103)) ##### Performance - Optimize meta hook file scans ([#2106](j178/prek#2106)) - Reduce run filtering allocations ([#2090](j178/prek#2090)) ##### Contributors - [@j178](https://github.com/j178) </details> --- ### Configuration 📅 **Schedule**: (UTC) - Branch creation - At any time (no schedule defined) - Automerge - At any time (no schedule defined) 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Mend Renovate](https://github.com/renovatebot/renovate).

Fix pre-push range after rebase

bd883c1

Copilot AI review requested due to automatic review settings May 17, 2026 07:58

Copilot started reviewing on behalf of j178 May 17, 2026 07:59 View session

j178 added the enhancement New feature or request label May 17, 2026

Copilot AI reviewed May 17, 2026

View reviewed changes

j178 merged commit a448514 into master May 17, 2026
35 checks passed

j178 deleted the pre-push-rebase branch May 17, 2026 09:41

BrewTestBot mentioned this pull request May 20, 2026

prek 0.4.1 Homebrew/homebrew-core#283700

Open

Conversation

j178 commented May 17, 2026

Uh oh!

codecov Bot commented May 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

prek-ci-bot Bot commented May 17, 2026

📦 Cargo Bloat Comparison

Head Branch Results

Base Branch Results

Uh oh!

prek-ci-bot Bot commented May 17, 2026

⚡️ Hyperfine Benchmarks

prek --version

prek list

prek validate-config .pre-commit-config.yaml

prek sample-config

prek run --all-files (cold - no cache)

prek run --all-files (warm - with cache)

prek run --all-files (full builtin hook suite)

prek run trailing-whitespace --all-files

prek run end-of-file-fixer --all-files

prek run check-json --all-files

prek run check-yaml --all-files

prek run check-toml --all-files

prek run check-xml --all-files

prek run detect-private-key --all-files

prek run fix-byte-order-marker --all-files

prek install-hooks (cold - no cache)

prek install-hooks (warm - with cache)

prek run (staged files only)

prek run --files '*.json' (specific file type)

prek run --dry-run --all-files (measures init overhead)

prek run check-hooks-apply --all-files

prek run check-useless-excludes --all-files

prek run identity --all-files

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

codecov Bot commented May 17, 2026 •

edited

Loading

`prek --version`

`prek list`

`prek validate-config .pre-commit-config.yaml`

`prek sample-config`

`prek run --all-files (cold - no cache)`

`prek run --all-files (warm - with cache)`

`prek run --all-files (full builtin hook suite)`

`prek run trailing-whitespace --all-files`

`prek run end-of-file-fixer --all-files`

`prek run check-json --all-files`

`prek run check-yaml --all-files`

`prek run check-toml --all-files`

`prek run check-xml --all-files`

`prek run detect-private-key --all-files`

`prek run fix-byte-order-marker --all-files`

`prek install-hooks (cold - no cache)`

`prek install-hooks (warm - with cache)`

`prek run (staged files only)`

`prek run --files '*.json' (specific file type)`

`prek run --dry-run --all-files (measures init overhead)`

`prek run check-hooks-apply --all-files`

`prek run check-useless-excludes --all-files`

`prek run identity --all-files`