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.

Prefer upstream branch in push result summary

Julius Marminge47019ad79d55
diff --git a/apps/web/src/components/GitActionsControl.logic.test.ts b/apps/web/src/components/GitActionsControl.logic.test.ts
index 42ab3ebca..6eba57429 100644
--- a/apps/web/src/components/GitActionsControl.logic.test.ts
+++ b/apps/web/src/components/GitActionsControl.logic.test.ts
@@ -615,7 +615,7 @@ describe("summarizeGitResult", () => {
});
assert.deepEqual(result, {
- title: "Pushed abcdef0 to foo",
+ title: "Pushed abcdef0 to origin/foo",
description: "fix: tighten quick action tooltip hover handling",
});
});
diff --git a/apps/web/src/components/GitActionsControl.logic.ts b/apps/web/src/components/GitActionsControl.logic.ts
index 3debfc121..ea9fd0ea0 100644
--- a/apps/web/src/components/GitActionsControl.logic.ts
+++ b/apps/web/src/components/GitActionsControl.logic.ts
@@ -50,7 +50,7 @@ export function summarizeGitResult(
if (result.push.status === "pushed") {
const shortSha = shortenSha(result.commit.commitSha);
- const branch = result.push.branch ?? result.push.upstreamBranch;
+ const branch = result.push.upstreamBranch ?? result.push.branch;
const pushedCommitPart = shortSha ? ` ${shortSha}` : "";
const branchPart = branch ? ` to ${branch}` : "";
return withDescription(