Polish git worktree helpers after rebase

Julius Marminge committed 9 months ago

Commit d1ecacd1 parent 64744902 files · +9 −16Browse files

Unified · Split

2 files

apps/desktop/src/git.test.ts +0 −10
apps/desktop/src/git.ts +9 −6

apps/desktop/src/git.test.ts+0−10

@@ -404,16 +404,6 @@ describe("git integration", () => { · 403 unmodified lines
404	await git(tmp.path, "add .");	404	await git(tmp.path, "add .");
405	await git(tmp.path, "commit -m 'diverge'");	405	await git(tmp.path, "commit -m 'diverge'");
406		406
407	// Go back to default branch
408	const defaultBranch = (await git(tmp.path, "rev-parse --abbrev-ref HEAD")).includes(
409	"diverged",
410	)
411	? // we're on diverged, need to find the other one
412	(await listGitBranches({ cwd: tmp.path })).branches.find(
413	(b) => !b.current && b.name !== "diverged",
414	)!.name
415	: await git(tmp.path, "rev-parse --abbrev-ref HEAD");
416
417	// Actually, let's just get back to the initial branch explicitly	407	// Actually, let's just get back to the initial branch explicitly
418	const allBranches = await listGitBranches({ cwd: tmp.path });	408	const allBranches = await listGitBranches({ cwd: tmp.path });
419	const initialBranch = allBranches.branches.find((b) => b.name !== "diverged")!.name;	409	const initialBranch = allBranches.branches.find((b) => b.name !== "diverged")!.name;

apps/desktop/src/git.ts+9−6

   TerminalCommandResult,
 } from "@t3tools/contracts";
+function escapeSingleQuotes(value: string): string {
+  return value.replace(/'/g, "'\\''");
+}
 export async function runTerminalCommand(
   input: TerminalCommandInput,
 ): Promise<TerminalCommandResult> {
       current: line.startsWith("* "),
       isDefault: line.replace(/^[*+]\s+/, "") === defaultBranch,
     }))
-    .sort((a, b) => {
+    .toSorted((a, b) => {
       if (a.current !== b.current) return a.current ? -1 : 1;
       if (a.isDefault !== b.isDefault) return a.isDefault ? -1 : 1;
       return a.name.localeCompare(b.name);
 export async function createGitWorktree(
   input: GitCreateWorktreeInput,
 ): Promise<GitCreateWorktreeResult> {
-  const esc = (s: string) => s.replace(/'/g, "'\\''");
   const sanitizedBranch = input.newBranch.replace(/\//g, "-");
   const repoName = path.basename(input.cwd);
   const worktreePath =
   // Create a new branch from the base branch in a new worktree
   const result = await runTerminalCommand({
-    command: `git worktree add -b '${esc(input.newBranch)}' '${esc(worktreePath)}' '${esc(input.branch)}'`,
+    command: `git worktree add -b '${escapeSingleQuotes(input.newBranch)}' '${escapeSingleQuotes(worktreePath)}' '${escapeSingleQuotes(input.branch)}'`,
     cwd: input.cwd,
     timeoutMs: 30_000,
   });
   input: GitRemoveWorktreeInput,
 ): Promise<void> {
   const result = await runTerminalCommand({
-    command: `git worktree remove '${input.path.replace(/'/g, "'\\''")}'`,
+    command: `git worktree remove '${escapeSingleQuotes(input.path)}'`,
     cwd: input.cwd,
     timeoutMs: 15_000,
   });
   input: GitCreateBranchInput,
 ): Promise<void> {
   const result = await runTerminalCommand({
-    command: `git branch '${input.branch.replace(/'/g, "'\\''")}'`,
+    command: `git branch '${escapeSingleQuotes(input.branch)}'`,
     cwd: input.cwd,
     timeoutMs: 10_000,
   });
   input: GitCheckoutInput,
 ): Promise<void> {
   const result = await runTerminalCommand({
-    command: `git checkout '${input.branch.replace(/'/g, "'\\''")}'`,
+    command: `git checkout '${escapeSingleQuotes(input.branch)}'`,
     cwd: input.cwd,
     timeoutMs: 10_000,
   });

Polish git worktree helpers after rebase

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code