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

Abierto
  • ¿Algo no está bien?
#994 0 comentarios 0 reacciones 0 asignados Ver en GitHub

Nadie ha tomado este issue todavía.

Evaluación

Dificultad
4/5
Tiempo estimado
3-5 días
Aptitud para principiantes
48/100
Tipo de issue
Error
Claridad
Bien especificado
Estado de actividad
Activo
Stack tecnológico
git, github
Área
backend

Línea de trabajo

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.

Escrito por el modelo de indexación a partir del texto del issue.

Descripción

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
Lenguaje dominante
Sin datos de lenguaje
Estrellas
52
Forks
26
Sin PR fusionados en 30 d

Preparar el entorno

Este proyecto no incluye contenedor de desarrollo, Dockerfile ni guía de contribución, así que la configuración corre por tu cuenta: empieza por su README y consulta nuestra guía para la primera contribución para los pasos generales.

Primeros pasos

  1. Lee el issue completo y luego la guía de contribución del proyecto.
  2. Comenta en el issue que vas a ocuparte — evita que dos personas hagan lo mismo.
  3. Haz un fork del repositorio y trabaja en una rama.
  4. Abre un pull request que haga referencia al número del issue.

Más de codecov/feedback

Todos los issues de codecov/feedback

Issues similares

Más issues de Backend & API Design

Recibe los nuevos issues en tu correo

Un resumen breve de issues de GitHub para principiantes.