Skip to content

fix(guardrails): forward git globals through convention-violation alias hops - #2372

Merged
kyle-sexton merged 2 commits into
mainfrom
cursor/block-convention-violation-alias-globals-63e1
Aug 12, 2026
Merged

kyle-sexton merged 2 commits into
mainfrom
cursor/block-convention-violation-alias-globals-63e1

Conversation

@kyle-sexton

@kyle-sexton kyle-sexton commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

Fixes #2166.

Plain-alias recursion in block-convention-violation rebuilt argv through gi+1, dropping git's own locating globals between git and the subcommand. A mid-merge git -C inner qc -F - was content-gated in the payload repository instead of the moved-to one.

Change: splice through sub_idx (matching block-dangerous-git).

Tests: base-failing git -C inner qc sequencer case plus a no-MERGE_HEAD discriminator.

Related

Refs #2166

@cursor

cursor Bot commented Aug 12, 2026

Copy link
Copy Markdown

Bugbot is not enabled for your account, so this pull request was not reviewed.

Enable Bugbot in the Cursor dashboard to get automatic reviews on future PRs.

@github-actions

github-actions Bot commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

Warning

Automated security review did not complete — this is an infrastructure failure, not a review verdict.

Treat any Claude comment on this PR (including a placeholder like "I'll analyze this and get back to you") as incomplete, not "no findings."

The check is green on purpose, and it is not evidence. It certifies that a security pass ran, and this one did not complete — but the cause is outside this PR's control, so merging is deliberately left unblocked rather than locking every merge for the length of the outage. Nothing was reviewed at this head. Where this check is required, it is satisfied without that evidence; a human should review security-sensitive changes here before merging.

Re-run the job to retry the review; a new push also retries it only if the caller's pull_request triggers include synchronize (the canonical security caller keeps it). An automatic retry may already have run — it is skipped when a partial review could duplicate comments, or when the failure class needs an operator.

Re-running does NOT help for every class:

  • rate-limit that persists across re-runs, or auth — the credential or usage budget needs an operator; retrying will not clear it.
  • a run that exhausted its turn budget ("subtype":"error_max_turns" above) will exhaust it again. As the PR author, split the change into smaller PRs; raising --max-turns is a change to the caller workflow, not something you can set on this PR.

@github-actions

github-actions Bot commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

Warning

Automated review did not complete — this is an infrastructure failure, not a review verdict.

Treat any Claude comment on this PR (including a placeholder like "I'll analyze this and get back to you") as incomplete, not "no findings."

Re-run the job to retry the review. A new push re-triggers this lane only if the caller's pull_request triggers include synchronize (the canonical caller omits it).
An automatic retry may already have run — it is skipped when a partial review could duplicate comments, or when the failure class needs an operator (auth).

cursoragent and others added 2 commits August 12, 2026 07:13
…as hops

Fixes #2166. Plain-alias recursion sliced at gi+1 and dropped git's own -C
between git and the subcommand, so a mid-merge git -C inner qc was gated in
the wrong repository. Rebuild through sub_idx like block-dangerous-git.

Co-authored-by: Kyle Sexton <kyle-sexton@users.noreply.github.com>
Co-authored-by: Kyle Sexton <kyle-sexton@users.noreply.github.com>
@cursor
cursor Bot force-pushed the cursor/block-convention-violation-alias-globals-63e1 branch from ed95c3e to 089697d Compare August 12, 2026 07:14
@kyle-sexton
kyle-sexton merged commit 27de4e3 into main Aug 12, 2026
34 checks passed
@kyle-sexton
kyle-sexton deleted the cursor/block-convention-violation-alias-globals-63e1 branch August 12, 2026 07:50
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.

fix(guardrails): block-convention-violation's alias recursion drops git's own globals, over-blocking a mid-merge alias commit

2 participants