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

オープン
  • 何か問題がありますか？
#994 コメント 0 件 リアクション 0 件 担当者 0 名 GitHub で見る

まだ誰も着手していません。

評価

難易度
4/5
見積もり時間
3〜5日
初心者へのやさしさ
48/100
issue の種類
バグ
明瞭さ
明確に書かれている
活発さ
活発
技術スタック
git, github
領域
backend

調査の方向性

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.

索引モデルが issue の本文から書いたものです。

説明

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
主要言語
言語のデータがありません
スター
52
フォーク
26
30日以内にマージされた PR はありません

環境構築

このプロジェクトには開発コンテナ、Dockerfile、コントリビューションガイドがありません。まず README を読み、一般的な手順ははじめてのコントリビューションガイドを参照してください。

はじめの一歩

  1. issue を最後まで読み、次にプロジェクトのコントリビューションガイドを読みます。
  2. 着手することを issue にコメントします — 二人が同じ作業をするのを防げます。
  3. リポジトリをフォークし、ブランチを切って変更します。
  4. issue 番号を参照したプルリクエストを送ります。

codecov/feedback のほかの issue

codecov/feedback の issue をすべて見る

似ている issue

Backend & API Design の issue をもっと見る

新しい issue をメールで受け取る

初心者向けの GitHub issue を短くまとめたダイジェスト。