Repository navigation
Conversation
_resolve_ref looked up the commit that deleted drafts/ with a path-filtered git log, which simplifies history: at a merge whose tree matches one parent for drafts/*, git follows that parent only. A bundle consolidated on a branch and merged with a merge commit into a line that never held drafts/ lost its deletion commit, so merge-audit, schism and release-check (acceptance.dissent: required) reported unreachable-ref / E_REL_DISSENT_UNVERIFIABLE over a tree identical to the green branch head. A re-extraction merged that way did not fail closed: it silently read the previous run's drafts. - The lookup adds --full-history, so every merged line is walked, and --date-order, so the first deletion listed is the newest even under clock skew: no commit is shown before its descendants. A merge is not itself listed as a deletion (no -m, so no diff). - reference-bundle.sh: two checks on copies of the green bundle, built with commit-tree so the working tree is never touched. The bundle merged into a line cut before drafts/ existed still passes release-check, and a re-extraction merged with a merge commit reads the second run's drafts. Both fail on the previous wheel. - USAGE-merge-audit.md: the manual lookup uses the same flags. Fixes vsov#10.
vsov
pushed a commit
that referenced
this pull request
Nov 4, 2026
- merge_audit: the drafts-deletion lookup walks every merged line (--full-history --date-order), and lists a merge commit that itself deletes drafts/ (--diff-merges=first-parent --no-patch). Before, a merge commit could hide the deletion (unreachable-ref) or make the audit read the previous run's drafts. - merge_audit: drafts are read as <commit>:./<draft>.md, so a bundle made with `okfy init --embed` reads them. - release-check: under acceptance.dissent: required, any merge-group draft that cannot be read or parsed fails with E_REL_DISSENT_UNVERIFIABLE, naming the draft. - smoke.sh: NEG embed; reference-bundle.sh: two merged-history checks. - Retrieval and federation code digests unchanged. Contributed by @vbanas in #12 and #14, with one neighbouring case (a merge that deletes drafts/) added here. Co-authored-by: vbanas <val.banas@gmail.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Owner
|
Thanks @vbanas — integrated by hand into the private source and published in 49a0c9d, with your commit authorship preserved ( One neighbouring case was added on top: a merge commit that itself deletes |
This was referenced Nov 4, 2026
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
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.
_resolve_ref looked up the commit that deleted drafts/ with a path-filtered git log, which simplifies history: at a merge whose tree matches one parent for drafts/*, git follows that parent only. A bundle consolidated on a branch and merged with a merge commit into a line that never held drafts/ lost its deletion commit, so merge-audit, schism and release-check (acceptance.dissent: required) reported unreachable-ref / E_REL_DISSENT_UNVERIFIABLE over a tree identical to the green branch head. A re-extraction merged that way did not fail closed: it silently read the previous run's drafts.
Fixes #10.