Skip to content

fix(web): use "branch" wording in Git quick action copy #2525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
imabdulazeez wants to merge 2 commits into from
Closed

fix(web): use "branch" wording in Git quick action copy #2525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab9842b
Replace 'ref' terminology with 'branch' in git actions
imabdulazeez May 5, 2026
9a7fedc
Remove CLAUDE.md symlink
imabdulazeez May 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CLAUDE.md
View file
Open in desktop
Copy link
Copy Markdown
Member

@juliusmarminge juliusmarminge May 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Copy Markdown
Contributor Author

@imabdulazeez imabdulazeez May 6, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry. This is embarassing. Had a edited version of Agents/Claude in a local branch and something must have got messed up here.. Closing this PR for now since its not a priority..

This file was deleted.

14 changes: 7 additions & 7 deletions apps/web/src/components/GitActionsControl.logic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ describe("when: ref has no upstream configured", () => {
});

describe("requiresDefaultBranchConfirmation", () => {
it("requires confirmation for push actions on default ref", () => {
it("requires confirmation for push actions on default branch", () => {
assert.isFalse(requiresDefaultBranchConfirmation("commit", true));
assert.isTrue(requiresDefaultBranchConfirmation("push", true));
assert.isTrue(requiresDefaultBranchConfirmation("create_pr", true));
Expand All @@ -894,9 +894,9 @@ describe("resolveDefaultBranchActionDialogCopy", () => {
});

assert.deepEqual(copy, {
title: "Push to default ref?",
title: "Push to default branch?",
description:
'This action will push local commits on "main". You can continue on this ref or create a feature ref and run the same action there.',
'This action will push local commits on "main". You can continue on this branch or create a feature branch and run the same action there.',
continueLabel: "Push to main",
});
});
Expand All @@ -909,9 +909,9 @@ describe("resolveDefaultBranchActionDialogCopy", () => {
});

assert.deepEqual(copy, {
title: "Push & create PR from default ref?",
title: "Push & create PR from default branch?",
description:
'This action will push local commits and create a pull request on "main". You can continue on this ref or create a feature ref and run the same action there.',
'This action will push local commits and create a pull request on "main". You can continue on this branch or create a feature branch and run the same action there.',
continueLabel: "Push & create PR",
});
});
Expand All @@ -924,9 +924,9 @@ describe("resolveDefaultBranchActionDialogCopy", () => {
});

assert.deepEqual(copy, {
title: "Commit, push & create PR from default ref?",
title: "Commit, push & create PR from default branch?",
description:
'This action will commit, push, and create a pull request on "main". You can continue on this ref or create a feature ref and run the same action there.',
'This action will commit, push, and create a pull request on "main". You can continue on this branch or create a feature branch and run the same action there.',
continueLabel: "Commit, push & create PR",
});
});
Expand Down
14 changes: 7 additions & 7 deletions apps/web/src/components/GitActionsControl.logic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export function buildGitActionProgressStages(input: {
terminology?: ChangeRequestTerminology;
}): string[] {
const terminology = input.terminology ?? DEFAULT_CHANGE_REQUEST_TERMINOLOGY;
const branchStages = input.featureBranch ? ["Preparing feature ref..."] : [];
const branchStages = input.featureBranch ? ["Preparing feature branch..."] : [];
const pushStage = input.pushTarget ? `Pushing to ${input.pushTarget}...` : "Pushing...";
const prStages = [
`Preparing ${terminology.shortLabel}...`,
Expand Down Expand Up @@ -197,7 +197,7 @@ export function resolveQuickAction(
label: "Commit",
disabled: true,
kind: "show_hint",
hint: `Create and checkout a ref before pushing or opening a ${terminology.singular}.`,
hint: `Create and checkout a branch before pushing or opening a ${terminology.singular}.`,
};
}

Expand Down Expand Up @@ -329,33 +329,33 @@ export function resolveDefaultBranchActionDialogCopy(input: {
terminology?: ChangeRequestTerminology;
}): DefaultBranchActionDialogCopy {
const branchLabel = input.branchName;
const suffix = ` on "${branchLabel}". You can continue on this ref or create a feature ref and run the same action there.`;
const suffix = ` on "${branchLabel}". You can continue on this branch or create a feature branch and run the same action there.`;
const terminology = input.terminology ?? DEFAULT_CHANGE_REQUEST_TERMINOLOGY;

if (input.action === "push" || input.action === "commit_push") {
if (input.includesCommit) {
return {
title: "Commit & push to default ref?",
title: "Commit & push to default branch?",
description: `This action will commit and push changes${suffix}`,
continueLabel: `Commit & push to ${branchLabel}`,
};
}
return {
title: "Push to default ref?",
title: "Push to default branch?",
description: `This action will push local commits${suffix}`,
continueLabel: `Push to ${branchLabel}`,
};
}

if (input.includesCommit) {
return {
title: `Commit, push & create ${terminology.shortLabel} from default ref?`,
title: `Commit, push & create ${terminology.shortLabel} from default branch?`,
description: `This action will commit, push, and create a ${terminology.singular}${suffix}`,
continueLabel: `Commit, push & create ${terminology.shortLabel}`,
};
}
return {
title: `Push & create ${terminology.shortLabel} from default ref?`,
title: `Push & create ${terminology.shortLabel} from default branch?`,
description: `This action will push local commits and create a ${terminology.singular}${suffix}`,
continueLabel: `Push & create ${terminology.shortLabel}`,
};
Expand Down
14 changes: 6 additions & 8 deletions apps/web/src/components/GitActionsControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ function getMenuActionDisabledReason({

if (item.id === "push") {
if (!hasBranch) {
return "Detached HEAD: checkout a refName before pushing.";
return "Detached HEAD: checkout a branch before pushing.";
}
if (hasChanges) {
return "Commit or stash local changes before pushing.";
Expand All @@ -283,7 +283,7 @@ function getMenuActionDisabledReason({
return `View ${terminology.singular} is currently unavailable.`;
}
if (!hasBranch) {
return `Detached HEAD: checkout a refName before creating a ${terminology.singular}.`;
return `Detached HEAD: checkout a branch before creating a ${terminology.singular}.`;
}
if (hasChanges) {
return `Commit local changes before creating a ${terminology.singular}.`;
Expand Down Expand Up @@ -1742,7 +1742,7 @@ export default function GitActionsControl({
) : null}
{gitStatusForActions?.refName === null && (
<p className="px-2 py-1.5 text-xs text-warning">
Detached HEAD: create and checkout a refName to enable push and pull request
Detached HEAD: create and checkout a branch to enable push and pull request
actions.
</p>
)}
Expand Down Expand Up @@ -1788,9 +1788,7 @@ export default function GitActionsControl({
{gitStatusForActions?.refName ?? "(detached HEAD)"}
</span>
{isDefaultRef && (
<span className="text-right text-warning text-xs">
Warning: default refName
</span>
<span className="text-right text-warning text-xs">Warning: default branch</span>
)}
</span>
</div>
Expand Down Expand Up @@ -1923,7 +1921,7 @@ export default function GitActionsControl({
disabled={noneSelected}
onClick={runDialogActionOnNewBranch}
>
Commit on new refName
Commit on new branch
</Button>
<Button size="sm" disabled={noneSelected} onClick={runDialogAction}>
Commit
Expand All @@ -1950,7 +1948,7 @@ export default function GitActionsControl({
<DialogPopup className="max-w-xl">
<DialogHeader>
<DialogTitle>
{pendingDefaultBranchActionCopy?.title ?? "Run action on default refName?"}
{pendingDefaultBranchActionCopy?.title ?? "Run action on default branch?"}
</DialogTitle>
<DialogDescription>{pendingDefaultBranchActionCopy?.description}</DialogDescription>
</DialogHeader>
Expand Down
Loading