Skip to content

fix: follow cd/Set-Location for merge and commit checks, release 1.8.5 - #93

Merged
tourbut merged 2 commits into
mainfrom
fix/merge-advice-cd
Oct 23, 2026
Merged

tourbut merged 2 commits into
mainfrom
fix/merge-advice-cd

Conversation

@tourbut

@tourbut tourbut commented Oct 23, 2026

Copy link
Copy Markdown
Owner

KnowsLink coordinator runs in the fullops/coor worktree and merges in the original checkout (merge origin/fullops/dev on main). 1.8.4's merge SHA advice only followed git -C, so cd <path> && git merge or Set-Location <path>; git merge was judged on the coordinator branch and skipped.

  • harness_gate.git_calls: per git command, the checkout it runs in, tracking cd/chdir/pushd/Set-Location/sl/Push-Location in the same command plus git -C. Used by integration.merge_drift and the unlinked evidence commit check.
  • Test: a coordinator worktree merging via cd and Set-Location gets the advice; a merge on its own branch does not.
  • Release 1.8.5 (no repo changes needed).

npm test passed.

🤖 Generated with Claude Code

tourbut and others added 2 commits October 24, 2026 00:20
A coordinator in its own worktree (fullops/coor in KnowsLink) merges in
the original checkout with `cd <path> && git merge` or
`Set-Location <path>; git merge`. The merge SHA advice only followed
`git -C`, saw the coordinator's branch and skipped the check. A shared
harness_gate.git_calls now tracks cd, chdir, pushd, Set-Location, sl and
Push-Location within the command for both the merge advice and the
unlinked evidence commit check.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@claude

claude Bot commented Oct 23, 2026

Copy link
Copy Markdown

Code review

No issues found. Checked for bugs and CLAUDE.md compliance.

@tourbut
tourbut merged commit d3fdd3f into main Oct 23, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant