Skip to content

Post-squash-merge verification: catch commits/security pins dropped by squash-merge #112

Description

@alamb-hex

Problem

Squash-merging a PR has twice silently dropped commits from main:

A dropped security pin is the worst case: CI (--frozen-lockfile) and fresh clones silently install the vulnerable version, and nothing flags it until the next scan.

Proposal

  • A lightweight post-merge check (CI job or local helper): after a squash-merge, diff main against the merged branch tip and report any file/override/lockfile delta that didn't make it in — especially package.json overrides and pnpm-lock.yaml version pins.
  • Optionally: a guard that fails CI if the committed lockfile contains a package version that a declared overrides entry says should be pinned higher (covers the dropped-pin case directly).

References

Related: the qs regression (ebbb582), #109 (the apply path that masked it).

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions