Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

Limit default-branch confirmation to direct push

Julius Marminge30e05538b797
diff --git a/apps/web/src/components/GitActionsControl.logic.test.ts b/apps/web/src/components/GitActionsControl.logic.test.ts
index 3b8464766..f4cdeeaea 100644
--- a/apps/web/src/components/GitActionsControl.logic.test.ts
+++ b/apps/web/src/components/GitActionsControl.logic.test.ts
@@ -737,10 +737,10 @@ describe("when: branch has no upstream configured", () => {
});
describe("requiresDefaultBranchConfirmation", () => {
- it("requires confirmation only for push actions on default branch", () => {
+ it("requires confirmation only for direct push on default branch", () => {
assert.isFalse(requiresDefaultBranchConfirmation("commit", true));
assert.isTrue(requiresDefaultBranchConfirmation("commit_push", true));
- assert.isTrue(requiresDefaultBranchConfirmation("commit_push_pr", true));
+ assert.isFalse(requiresDefaultBranchConfirmation("commit_push_pr", true));
assert.isFalse(requiresDefaultBranchConfirmation("commit_push", false));
});
});
diff --git a/apps/web/src/components/GitActionsControl.logic.ts b/apps/web/src/components/GitActionsControl.logic.ts
index 9a9476e4c..d752a90ce 100644
--- a/apps/web/src/components/GitActionsControl.logic.ts
+++ b/apps/web/src/components/GitActionsControl.logic.ts
@@ -282,7 +282,7 @@ export function requiresDefaultBranchConfirmation(
isDefaultBranch: boolean,
): boolean {
if (!isDefaultBranch) return false;
- return action === "commit_push" || action === "commit_push_pr";
+ return action === "commit_push";
}
export function resolveDefaultBranchActionDialogCopy(input: {