fix: check for worktree repo

Author: Phil Stainer

src/commands/add.ts

@@ -4,7 +4,7 @@ import {
   fetch,
   getRemoteBranches,
   removeLocalBranchesThatDoNotExistOnRemoteRepository,
-  throwIfNotRepository,
+  throwIfNotInWorktreeRepository,
 } from '../helpers/git';
 import {
   getUniqueWorktreeName,
@@ -21,7 +21,7 @@ const createWorktreeOption = 'Create new worktree';
 
 export const add = async () => {
   try {
-    await throwIfNotRepository();
+    await throwIfNotInWorktreeRepository();
 
     await fetch();
 

src/commands/list.ts

@@ -1,4 +1,4 @@
-import { throwIfNotRepository } from '#/helpers/git';
+import { throwIfNotInWorktreeRepository } from '#/helpers/git';
 import settings from '../config/settings';
 import { raiseIssue, showUserMessage } from '../helpers/vscode';
 import { getWorktrees } from '../helpers/worktree/getWorktrees';
@@ -7,7 +7,7 @@ import { shouldMoveIntoWorktree } from '../helpers/worktree/shouldMoveIntoWorktr
 
 export const list = async () => {
   try {
-    await throwIfNotRepository();
+    await throwIfNotInWorktreeRepository();
 
     const worktrees = await getWorktrees();
     if (!worktrees.length)

src/commands/publish.ts

@@ -3,15 +3,15 @@ import {
   getRemoteBranches,
   getRemoteOrigin,
   pushNewBranchToRemote,
-  throwIfNotRepository,
+  throwIfNotInWorktreeRepository,
 } from '../helpers/git';
 import { raiseIssue, showUserMessage } from '../helpers/vscode';
 import { getWorktrees } from '../helpers/worktree/getWorktrees';
 import { selectWorktree } from '../helpers/worktree/selectWorktree';
 
 export const publish = async () => {
   try {
-    await throwIfNotRepository();
+    await throwIfNotInWorktreeRepository();
 
     const hasRemote = await getRemoteOrigin();
     if (!hasRemote)

src/commands/remove.ts

@@ -1,4 +1,4 @@
-import { removeBranch, throwIfNotRepository } from '#/helpers/git';
+import { removeBranch, throwIfNotInWorktreeRepository } from '#/helpers/git';
 import settings from '../config/settings';
 import { raiseIssue, showUserMessage } from '../helpers/vscode';
 import { getWorktrees } from '../helpers/worktree/getWorktrees';
@@ -8,7 +8,7 @@ import { selectWorktree } from '../helpers/worktree/selectWorktree';
 
 export const remove = async () => {
   try {
-    await throwIfNotRepository();
+    await throwIfNotInWorktreeRepository();
 
     const worktrees = await getWorktrees();
     if (!worktrees.length)

src/commands/rename.ts

@@ -5,7 +5,7 @@ import {
   fetch,
   getRemoteOrigin,
   pushNewBranchToRemote,
-  throwIfNotRepository,
+  throwIfNotInWorktreeRepository,
 } from '../helpers/git';
 import {
   getUniqueWorktreeName,
@@ -19,7 +19,7 @@ import { shouldMoveIntoWorktree } from '../helpers/worktree/shouldMoveIntoWorktr
 
 export const rename = async () => {
   try {
-    await throwIfNotRepository();
+    await throwIfNotInWorktreeRepository();
 
     const worktrees = await getWorktrees();
     if (!worktrees.length)

src/helpers/general.ts

@@ -10,6 +10,8 @@ import { loggingOptions, loggingOptionValue } from '../config/constants';
 import { globalState } from '../extension';
 import { isExistingDirectory } from './file';
 
+import type { ExecOptions } from 'child_process';
+
 const exec = util.promisify(require('child_process').exec);
 
 export const getCurrentPath = () => workspace.rootPath;
@@ -21,7 +23,10 @@ export const getCurrentDirectory = () => {
 };
 export const getWorkspaceFilePath = () => workspace.workspaceFile;
 
-export const executeCommand = async (command: string, options?: any) => {
+export const executeCommand = async (
+  command: string,
+  options?: ExecOptions
+) => {
   let execOptions = options;
 
   if (!options) {

src/helpers/git.ts

@@ -6,17 +6,6 @@ import { executeCommand } from './general';
 import { removeNewLine } from './string';
 import { getWorktrees } from './worktree/getWorktrees';
 
-export const isGitRepository = async () => {
-  try {
-    const command = 'git rev-parse --is-inside-work-tree';
-    await executeCommand(command);
-
-    return true;
-  } catch (e: any) {
-    return false;
-  }
-};
-
 export const getRemoteOrigin = async () => {
   const command = 'git remote';
 
@@ -30,27 +19,39 @@ export const getRemoteOrigin = async () => {
   }
 };
 
-export const throwIfNotRepository = async () => {
-  const isRepo = await isGitRepository();
-
-  if (isRepo) return;
+export const isInsideWorkTree = async () => {
+  try {
+    const command = 'git rev-parse --is-inside-work-tree';
+    await executeCommand(command);
 
-  throw new Error('This is not a git repository.');
+    return true;
+  } catch (e: any) {
+    return false;
+  }
 };
 
-export const isBareRepository = async (path: string) => {
+export const isInsideBareRepository = async (path?: string) => {
   try {
-    const command = `git -C ${path} rev-parse --is-bare-repository`;
-    const { stdout } = await executeCommand(command);
+    const command = `git rev-parse --is-bare-repository`;
+    const { stdout } = await executeCommand(command, { cwd: path });
 
     const result = removeNewLine(stdout);
 
     return result === 'true';
   } catch (e: any) {
-    throw Error(e);
+    return false;
   }
 };
 
+export const throwIfNotInWorktreeRepository = async () => {
+  const isWorktree = await isInsideWorkTree();
+  const isBareRepo = await isInsideBareRepository();
+
+  if (isWorktree || isBareRepo) return;
+
+  throw new Error('You are not in a worktree or bare repo');
+};
+
 const hasBareRepository = async () => {
   const worktrees = await getWorktrees(true);
   const hasBareRepo = worktrees.find((wt) => wt.worktree === BARE_REPOSITORY);

src/helpers/worktree/calculateNewWorktreePath.ts

@@ -1,7 +1,7 @@
 import settings from '#/src/config/settings';
 import { isAbsolute, resolve } from 'path';
 import { executeCommand } from '../general';
-import { isBareRepository } from '../git';
+import { isInsideBareRepository } from '../git';
 import { removeNewLine } from '../string';
 
 const baseDirectory = settings.baseDirectory;
@@ -13,7 +13,7 @@ export const calculateNewWorktreePath = async (branch: string) => {
 
     const path = removeNewLine(stdout);
 
-    const isBare = await isBareRepository(path);
+    const isBare = await isInsideBareRepository(path);
     if (!isBare) throw new Error('Bare repository not found');
 
     const resolvedPath = isAbsolute(baseDirectory)