chore(upstream): record ours-merge of Netflix 966be8d5 (bookkeeping)#58
Merged
chore(upstream): record ours-merge of Netflix 966be8d5 (bookkeeping)#58
Conversation
lusoris
pushed a commit
that referenced
this pull request
Apr 19, 2026
The `generic-api-key` rule flags ` - key: src01_hrc00_576x324` in ai/src/vmaf_train/data/manifests/README.md line 20 because "key:" + an entropic token (a public Netflix VMAF sample name) matches its heuristic. That README is documentation showing the YAML manifest format, not a manifest itself — no real secrets live there. Only surfaced now because PR #58's ours-merge expanded the gitleaks scan range (`--first-parent 966be8d^..<merge>`) to every fork commit since divergence. Prior PR-diff-only scans never touched this file. Add an explicit path allowlist entry (not a regex/stopword) so future edits to real manifest files still get scanned. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2 tasks
lusoris
added a commit
that referenced
this pull request
Apr 19, 2026
The `generic-api-key` rule flags ` - key: src01_hrc00_576x324` in ai/src/vmaf_train/data/manifests/README.md line 20 because "key:" + an entropic token (a public Netflix VMAF sample name) matches its heuristic. That README is documentation showing the YAML manifest format, not a manifest itself — no real secrets live there. Only surfaced now because PR #58's ours-merge expanded the gitleaks scan range (`--first-parent 966be8d^..<merge>`) to every fork commit since divergence. Prior PR-diff-only scans never touched this file. Add an explicit path allowlist entry (not a regex/stopword) so future edits to real manifest files still get scanned. Co-authored-by: Lusoris <lusoris@pm.me> Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
… in d06dd6c) Netflix/vmaf master advanced to 966be8d (libvmaf/feature: port adm updates). Content is already in this fork via d06dd6c (PR #44) with fork-specific additions (compat_builtin.h include, Copyright bump 2016-2023 -> 2016-2026 per fork convention, MinGW/CodeQL cast fixes in barten_csf_tools.h). This is an ours-merge with no tree change; its sole purpose is to record 966be8d as a second parent so GitHub compare view (Netflix:master...lusoris:master) reflects 'behind by 0' instead of showing 966be8d as unmerged. No code change. No CHANGELOG entry (no user-visible delta). No ADR (bookkeeping, not a decision). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
lusoris
force-pushed
the
chore/sync-upstream-966be8d5
branch
from
0275b9a to
fddc5ca
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
966be8d5(libvmaf/feature: port adm updates) as a parent of forkmasterd06dd6cf(PR feat(libvmaf/feature): port upstream ADM updates (Netflix 966be8d5) #44) with fork-specific additions (compat_builtin.h, copyright bumps, MinGW/CodeQL cast fixes)Netflix:master...lusoris:master) from "behind by 1" to "behind by 0" so readers no longer think966be8d5is unmergedWhy a merge commit
GitHub compare compares by SHA parentage, not content. Our port is a fresh commit with a different SHA, so upstream's
966be8d5never appears in our history as an ancestor. An ours-merge records it as a second parent without touching the tree.Branch-protection impact
required_linear_history: truenormally rejects merge commits. This PR is a documented one-shot exception — the-s oursshape is essential to the goal (a squash-merge would flatten the second parent and defeat the PR). Procedure:PATCHprotection:required_linear_history: falsePATCHprotection back torequired_linear_history: trueTest plan
git log --graphlocally shows two-parent merge with966be8d5as second parentgit diff masteris empty (tree unchanged)gh api repos/Netflix/vmaf/compare/master...lusoris:vmaf:master --jq '.behind_by'returns0required_linear_history: trueand 23 required checksNo CHANGELOG entry (no user-visible delta). No ADR (bookkeeping, not a decision).
🤖 Generated with Claude Code