Merge commits can take the PR head as parent, dropping carryforward flags on the base branch
Nobody has claimed this yet.
Assessment
- Difficulty
- 4/5
- Estimated time
- 3-5 days
- Newbie friendliness
- 48/100
- Issue type
- Bug
- Clarity
- Clearly specified
- Activity status
- Active
- Tech stack
- git, github
- Domain
- backend
Research direction
The report identifies apps/worker/services/repository.py, especially fetch_appropriate_parent_for_commit and _possibly_filter_out_branch, as the parent selection path. Read those functions alongside the merge handling in apps/worker/tasks/sync_pull.py, then trace how git parent order reaches the database query. Done means merge commits select the first git parent for the base branch and tests cover the case where both parents are stored on that branch.
Written by the indexing model from the issue text.
Description
Summary
When a PR is merged with a merge commit (not squash/rebase), Codecov can pick the PR head as the parent of the merge commit on the base branch instead of the previous base-branch commit (the first git parent). With carryforward flags, the base branch then inherits the PR branch's report, so flags the PR never uploaded disappear from the base branch, or roll back to stale values.
In our repo (39 carryforward flags, CI runs only affected projects per PR) this happens on roughly half of merges. After about a week, 27 of the 39 flags had no coverage on main's head, and PRs showed (?) / "No coverage information found on base report" for them.
Root cause (worker source, codecov/umbrella @ 6d449dd)
apps/worker/tasks/sync_pull.py(L396-L420): when a PR is merged without squash, every commit on the PR includingpull.headis updated tobranch=<base branch>,merged=True.apps/worker/services/repository.pyfetch_appropriate_parent_for_commit(L109-L157): the merge commit's git parents are looked up, and both exist in Codecov's DB (the previousmaincommit from the push upload, the PR head from PR CI)._possibly_filter_out_branch(L160-L170) returns the first row whosebranchequals the commit's branch. After step 1, both parents havebranch=main. The query has noORDER BY, and git parent order is never consulted, so whichever row the DB returns first wins.
Empirically the row with the lexicographically smaller commit SHA wins: that held for every merge commit we checked (19 of 19), and it picks the PR head about half the time.
Expected
For a merge commit, prefer the first git parent (the previous commit on the base branch), e.g. preserve git_commit["parents"] order in _possibly_filter_out_branch instead of relying on the unordered query result.
Things we tried that don't help
- Uploading with an explicit parent (
commit_parentin codecov-action v5 /--parent-shain the CLI): the stored parent is still the one chosen above. - No
codecov.ymlkey controls parent selection. - Changing the merge strategy to squash avoids it, but that isn't an option for us.
Environment
- GitHub, Codecov GitHub App,
codecov/codecov-action@v5 - Carryforward on all flags,
strict_yaml_branch: main, merge-commit merges
- Dominant language
- No language data
- Stars
- 52
- Forks
- 25
- PR merge metrics
- No merged PRs in 30d
Getting set up
This project ships no dev container, Dockerfile or contributing guide, so setting up is up to you: start from its README, and see our first-contribution guide for the general steps.
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
More from codecov/feedback
-
Difficulty 2/5 1-3 hours Newbie friendliness 62/100
-
Bundle analysis: `normalizePath` replaces everything after the first `-` in a file name, so different assets collidePossibly taken @ChiptenIsCool claimed this 16 days ago. Open
Difficulty 2/5 1-3 hours Newbie friendliness 72/100
-
Docs Waiting for: Product Owner
Difficulty 1/5 Under an hour Newbie friendliness 65/100
-
Difficulty 4/5 3-5 days Newbie friendliness 52/100
-
Difficulty 4/5 1-2 days Newbie friendliness 42/100
All issues in codecov/feedback
Similar issues
-
backlog-skill bot cat:tech-debt effort:s ready-for-agent refactor sev:low
Difficulty 2/5 1-3 hours Newbie friendliness 72/100
LucasSantana-Dev/Lucky#3283 ·
Maintainers usually reply within 1 day
-
area: backend bug priority: low
Difficulty 2/5 1-3 hours Newbie friendliness 72/100
snapotter-hq/SnapOtter#5194 ·
Maintainers usually reply within 1 day
-
go good first issue help wanted
Difficulty 2/5 1-3 hours Newbie friendliness 86/100
Maintainers usually reply within 1 day
-
Difficulty 2/5 1-3 hours Newbie friendliness 74/100
aws/aws-emulator#610 ·
-
bug
Difficulty 2/5 1-3 hours Newbie friendliness 72/100
jxxghp/MoviePilot#7531 ·
Maintainers usually reply within 1 day