diff --git a/apps/desktop/electron/git-worktree-ops.test.ts b/apps/desktop/electron/git-worktree-ops.test.ts index 0149088ff8..0c4d94c301 100644 --- a/apps/desktop/electron/git-worktree-ops.test.ts +++ b/apps/desktop/electron/git-worktree-ops.test.ts @@ -328,7 +328,10 @@ test('addWorktree: base origin/main does not set up upstream tracking', async () function seedRemoteAndClone(label, branches) { const remoteDir = fs.mkdtempSync(path.join(os.tmpdir(), `hermes-${label}-remote-`)) const cloneDir = fs.mkdtempSync(path.join(os.tmpdir(), `hermes-${label}-clone-`)) - const remoteGit = (...args) => execFileSync('git', ['-C', remoteDir, ...args]).toString().trim() + const remoteGit = (...args) => + execFileSync('git', ['-C', remoteDir, ...args]) + .toString() + .trim() execFileSync('git', ['init', '-b', 'main', remoteDir]) remoteGit('-c', 'user.email=hermes@localhost', '-c', 'user.name=Hermes', 'commit', '--allow-empty', '-m', 'root') @@ -382,7 +385,10 @@ test('addWorktree: a remote branch becomes a local branch tracking it', async () try { const result = await addWorktree(cloneDir, { existingBranch: 'origin/teammate-work' }, 'git') - const inTree = (...args) => execFileSync('git', ['-C', result.path, ...args]).toString().trim() + const inTree = (...args) => + execFileSync('git', ['-C', result.path, ...args]) + .toString() + .trim() // The worktree is on a local branch that has the name of the remote one. It // is not on a detached HEAD, which is the result of a checkout of @@ -402,7 +408,10 @@ test('addWorktree: a remote branch becomes a local branch tracking it', async () test('addWorktree: a remote default branch gets its own worktree, not a home switch', async () => { const { cloneDir, remoteDir } = seedRemoteAndClone('convert-remote-default', []) - const git = (...args) => execFileSync('git', ['-C', cloneDir, ...args]).toString().trim() + const git = (...args) => + execFileSync('git', ['-C', cloneDir, ...args]) + .toString() + .trim() try { // Move the main checkout off `main`, which makes "origin/main" convertible. diff --git a/apps/desktop/src/app/chat/sidebar/index.tsx b/apps/desktop/src/app/chat/sidebar/index.tsx index 30f07be115..a6cee59ea0 100644 --- a/apps/desktop/src/app/chat/sidebar/index.tsx +++ b/apps/desktop/src/app/chat/sidebar/index.tsx @@ -1335,9 +1335,7 @@ export function ChatSidebar({ headerAction={ inProject && enteredProject ? (