Merge commits can take the PR head as parent, dropping carryforward flags on the base branch

Open
#994 0 comments 0 reactions 0 assignees View on GitHub

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)

  1. apps/worker/tasks/sync_pull.py (L396-L420): when a PR is merged without squash, every commit on the PR including pull.head is updated to branch=<base branch>, merged=True.
  2. apps/worker/services/repository.py fetch_appropriate_parent_for_commit (L109-L157): the merge commit's git parents are looked up, and both exist in Codecov's DB (the previous main commit from the push upload, the PR head from PR CI).
  3. _possibly_filter_out_branch (L160-L170) returns the first row whose branch equals the commit's branch. After step 1, both parents have branch=main. The query has no ORDER 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_parent in codecov-action v5 / --parent-sha in the CLI): the stored parent is still the one chosen above.
  • No codecov.yml key 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

  1. Read the whole issue, then the project's contributing guide.
  2. Comment on the issue to say you are picking it up — it saves two people doing the same work.
  3. Fork the repository and make your change on a branch.
  4. Open a pull request that references the issue number.

More from codecov/feedback

All issues in codecov/feedback

Similar issues

More Backend & API Design issues

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.